CONSOLE/MGM: Move fsck commands to on/off semantics rather than toggle. Fixes EOS-6275

Author: esindril

common/Mapping.cc

@@ -842,13 +842,15 @@ Mapping::IdMap(const XrdSecEntity* client, const char* env, const char* tident,
         eos_static_err("failed to decode token tident='%s' token='%s' errno=%d", tident,
                        authz.c_str(), -rc);
       } else {
-	bool validated = true;
-	if (path.length() && path.substr(0,6) != "/proc/") {
-	  if (vid.token->ValidatePath(path)) {
-	    eos_static_err("token:validatepath msg=\"path validation failed for '%s'\"", path.c_str());
-	    validated = false;
-	  }
-	}
+        bool validated = true;
+
+        if (path.length() && path.substr(0, 6) != "/proc/") {
+          if (vid.token->ValidatePath(path)) {
+            eos_static_err("token:validatepath msg=\"path validation failed for '%s'\"",
+                           path.c_str());
+            validated = false;
+          }
+        }
 
         // if the path is screened we change owner/group
         if (validated && !vid.token->Owner().empty()) {
@@ -864,7 +866,8 @@ Mapping::IdMap(const XrdSecEntity* client, const char* env, const char* tident,
         if (EOS_LOGS_INFO) {
           std::string dump;
           vid.token->Dump(dump, true, true);
-          eos_static_info("%s {tokensudo:%d (%d)}", dump.c_str(), token_sudo, gTokenSudo.load());
+          eos_static_info("%s {tokensudo:%d (%d)}", dump.c_str(), token_sudo,
+                          gTokenSudo.load());
         }
       }
     } else {
@@ -1137,7 +1140,6 @@ Mapping::HandleVOMS(const XrdSecEntity* client, VirtualIdentity& vid)
   }
 }
 
-
 //------------------------------------------------------------------------------
 // Handle HTTPS authz keys mapping
 //------------------------------------------------------------------------------

common/Mapping.hh

@@ -386,7 +386,7 @@ public:
   static void HandleUidGidMapping(const char* name, VirtualIdentity& vid,
                                   const std::string& uid_key_name,
                                   const std::string& gid_key_name,
-				  bool force=false);
+                                  bool force = false);
 
   static void cacheUserIds(uid_t uid, const std::string& username);
   static void cacheGroupIds(gid_t gid, const std::string& groupname);
@@ -415,7 +415,6 @@ public:
   static void addSecondaryGroups(VirtualIdentity& vid, const std::string& name,
                                  gid_t gid);
 
-
   //----------------------------------------------------------------------------
   //! Handle HTTPS authz key mapping
   //!

console/commands/com_proto_fsck.cc

@@ -61,20 +61,20 @@ void com_fsck_help()
       << "    print summary of consistency checks\n"
       << "    -m         : print in monitoring format\n"
       << std::endl
-      << "  fsck config <key> [<value>]\n"
+      << "  fsck config <key> <value>\n"
       << "    configure the fsck with the following possible options:\n"
-      << "    toggle-collect       : enable/disable error collection thread, <value> represents\n"
-      << "                           the collection interval in minutes [default 30]\n"
-      << "    toggle-repair        : enable/disable repair thread, no <value> required\n"
-      << "    toggle-best-effort   : enable/disable best-effort repair mode, no <value> required\n"
+      << "    collect-interval-min : collection interval in minutes [default 30]\n"
+      << "    collect              : control error collection thread - on/off\n"
+      << "    repair               : control error repair thread - on/off\n"
+      << "    best-effort          : control best-effort repair mode - on/off\n"
       << "    repair-category      : specify error types that the repair thread will handle\n"
       << "                           e.g all, m_cx_diff, m_mem_sz_diff, d_cx_diff, d_mem_sz_diff,\n"
-      << "                               unreg_n, rep_diff_n, rep_missing_n, blockxs_err\n"
-      << "    show-dark-files      : yes/no [default no]\n"
-      << "    show-offline         : yes/no [default no]\n"
-      << "    show-no-replica      : yes/no [default no]\n"
+      << "                           unreg_n, rep_diff_n, rep_missing_n, blockxs_err\n"
       << "    max-queued-jobs      : maximum number of queued jobs\n"
       << "    max-thread-pool-size : maximum number of threads in the fsck pool\n"
+      << "    show-dark-files      : on/off [default off] - might affect instance performance\n"
+      << "    show-offline         : on/off [default off] - might affect instance performance\n"
+      << "    show-no-replica      : on/off [default off] - might affect instance performance\n"
       << std::endl
       << "  fsck report [-a] [-h] [-i] [-l] [-j|--json] [--error <tag1> <tag2> ...]\n"
       << "    report consistency check results, with the following options\n"