MGM: Properly display and enforce the enable flag for the recycle bin

Author: esindril

mgm/proc/user/RecycleCmd.cc

@@ -151,6 +151,8 @@ RecycleCmd::ProcessRequest() noexcept
       retc = Recycle::Config(std_out, std_err, mVid, config.op(), config.value());
     } else if (config.op() == eos::console::RecycleProto_ConfigProto::ENFORCE) {
       retc = Recycle::Config(std_out, std_err, mVid, config.op(), config.value());
+    } else if (config.op() == eos::console::RecycleProto_ConfigProto::ENABLE) {
+      retc = Recycle::Config(std_out, std_err, mVid, config.op(), config.value());
     } else if (config.op() == eos::console::RecycleProto_ConfigProto::DUMP) {
       retc = 0;
       std_out = gOFS->mRecycler->Dump();

mgm/recycle/Recycle.cc

@@ -1311,6 +1311,21 @@ Recycle::Config(std::string& std_out, std::string& std_err,
     if (!gOFS->mRecycler->mPolicy.Config(RecyclePolicy::sEnforceKey, value,
                                          std_err)) {
       return EINVAL;
+    } else {
+      if (value == "on") {
+        std_out += "success: recycle bin enforced";
+      } else {
+        std_out += "success: recycle bin not enforced";
+      }
+    }
+  } else if (op == eos::console::RecycleProto_ConfigProto::ENABLE) {
+    if (value.empty() || ((value != "on") && (value != "off"))) {
+      std_err = "error: missing/wrong ennable value\n";
+      return EINVAL;
+    }
+
+    if (!gOFS->mRecycler->mPolicy.Config(RecyclePolicy::sEnableKey, value, std_err)) {
+      return EINVAL;
     } else {
       if (value == "on") {
         std_out += "success: recycle bin enabled";

mgm/recycle/RecyclePolicy.cc

@@ -72,12 +72,12 @@ void RecyclePolicy::ApplyConfig(eos::mgm::FsView* fsview)
 bool RecyclePolicy::StoreConfig()
 {
   std::ostringstream oss;
-  oss << sEnforceKey << "=" << (mEnforced.load() ? "on" : "off")
-      << sEnforceKey << "=" << (mEnforced.load() ? "on" : "off")
-      << sKeepTimeKey << "=" << mKeepTimeSec.load() << " "
-      << sRatioKey << "=" << mSpaceKeepRatio.load() << " "
-      << sCollectKey << "=" << mCollectInterval.load().count() << " "
-      << sRemoveKey << "=" << mRemoveInterval.load().count() << " "
+  oss << sEnforceKey << "=" << (mEnforced.load() ? "on" : "off") << " " //
+      << sEnableKey << "=" << (mEnabled.load() ? "on" : "off") << " "   //
+      << sKeepTimeKey << "=" << mKeepTimeSec.load() << " "              //
+      << sRatioKey << "=" << mSpaceKeepRatio.load() << " "              //
+      << sCollectKey << "=" << mCollectInterval.load().count() << " "   //
+      << sRemoveKey << "=" << mRemoveInterval.load().count() << " "     //
       << sDryRunKey << "=" << (mDryRun.load() ? "yes" : "no");
   return FsView::gFsView.SetGlobalConfig("recycle", oss.str());
 }
@@ -157,6 +157,7 @@ RecyclePolicy::Dump(const std::string& delim) const
 {
   std::ostringstream oss;
   oss << "enforced=" << (mEnforced.load() ? "on" : "off") << delim
+      << "enabled=" << (mEnabled.load() ? "on" : "off") << delim
       << "dry_run=" << (mDryRun.load() ? "yes" : "no") << delim
       << "keep_time_sec=" << mKeepTimeSec.load() << delim
       << "space_keep_ratio=" << mSpaceKeepRatio.load() << delim