MGM: Remove unused members of the Recycle class

Author: esindril

mgm/recycle/Recycle.cc

@@ -94,26 +94,13 @@ EOSMGMNAMESPACE_BEGIN
 // /eos/<instance>/proc/recycle/
 std::string Recycle::gRecyclingPrefix = "/recycle/";
 std::string Recycle::gRecyclingAttribute = "sys.recycle";
-std::string Recycle::gRecyclingTimeAttribute = "sys.recycle.keeptime";
-std::string Recycle::gRecyclingKeepRatio = "sys.recycle.keepratio";
-std::string Recycle::gRecyclingCollectInterval = "sys.recycle.collectinterval";
-std::string Recycle::gRecyclingRemoveInterval = "sys.recycle.removeinterval";
-std::string Recycle::gRecyclingDryRunAttribute = "sys.recycle.dryrun";
+std::string Recycle::gRecyclingPostFix = ".d";
 std::string Recycle::gRecyclingVersionKey = "sys.recycle.version.key";
 std::string Recycle::gRecycleIdXattrKey = "sys.forced.recycleid";
-std::string Recycle::gRecyclingPostFix = ".d";
 eos::common::VirtualIdentity Recycle::mRootVid =
   eos::common::VirtualIdentity::Root();
 std::chrono::seconds Recycle::mLastRemoveTs = std::chrono::seconds(0);
 
-//------------------------------------------------------------------------------
-// Default constructor
-//------------------------------------------------------------------------------
-Recycle::Recycle(bool fake_clock) :
-  mPath(""), mRecycleDir(""), mRecyclePath(""), mOwnerUid(DAEMONUID),
-  mOwnerGid(DAEMONGID), mId(0), mClock(fake_clock)
-{}
-
 //------------------------------------------------------------------------------
 // Collect entries to recycle based on the current policy
 //------------------------------------------------------------------------------
@@ -714,45 +701,32 @@ Recycle::Print(std::string& std_out, std::string& std_err,
       unsigned long long used_inodes = map_quotas[SpaceQuota::kGroupFilesIs];
       unsigned long long max_inodes = map_quotas[SpaceQuota::kGroupFilesTarget];
       char sline[4096];
-      eos::IContainerMD::XAttrMap attrmap;
-      XrdOucErrInfo error;
-
-      // Check if this path has a recycle attribute
-      if (gOFS->_attr_ls(Recycle::gRecyclingPrefix.c_str(), error, mRootVid, "",
-                         attrmap)) {
-        eos_static_err("msg=\"unable to get attribute on recycle path\" "
-                       "recycle-path=%s", Recycle::gRecyclingPrefix.c_str());
-      }
 
       if (!monitoring) {
         oss_out << "# _________________________________________________________"
                 << "___________________________________________________________"
                 << "___________________________" << std::endl;
         snprintf(sline, sizeof(sline) - 1, "# used %s out of %s (%.02f%% volume) "
-                 "used %llu out of %llu (%.02f%% inodes used) Object-Lifetime %s [s] Keep-Ratio %s",
+                 "used %llu out of %llu (%.02f%% inodes used) Object-Lifetime %lu [s] Keep-Ratio %.02f",
                  StringConversion::GetReadableSizeString(used_bytes, "B").c_str(),
                  StringConversion::GetReadableSizeString(max_bytes, "B").c_str(),
                  used_bytes * 100.0 / max_bytes,
                  used_inodes, max_inodes, used_inodes * 100.0 / max_inodes,
-                 attrmap.count(Recycle::gRecyclingTimeAttribute) ?
-                 attrmap[Recycle::gRecyclingTimeAttribute].c_str() : "not configured",
-                 attrmap.count(Recycle::gRecyclingKeepRatio) ?
-                 attrmap[Recycle::gRecyclingKeepRatio].c_str() : "not configured");
+                 gOFS->mRecycler->GetKeepTime(),
+                 gOFS->mRecycler->GetKeepRatio());
         oss_out << sline << std::endl
                 << "# _________________________________________________________"
                 << "___________________________________________________________"
                 << "___________________________" << std::endl;
       } else {
         snprintf(sline, sizeof(sline) - 1, "recycle-bin=%s usedbytes=%llu "
                  "maxbytes=%llu volumeusage=%.02f%% usedinodes=%llu "
-                 "maxinodes=%llu inodeusage=%.02f%% lifetime=%s ratio=%s",
+                 "maxinodes=%llu inodeusage=%.02f%% lifetime=%lu ratio=%.02f",
                  Recycle::gRecyclingPrefix.c_str(),
                  used_bytes, max_bytes, used_bytes * 100.0 / max_bytes,
                  used_inodes, max_inodes, used_inodes * 100.0 / max_inodes,
-                 attrmap.count(Recycle::gRecyclingTimeAttribute) ?
-                 attrmap[Recycle::gRecyclingTimeAttribute].c_str() : "-1",
-                 attrmap.count(Recycle::gRecyclingKeepRatio) ?
-                 attrmap[Recycle::gRecyclingKeepRatio].c_str() : "-1");
+                 gOFS->mRecycler->GetKeepTime(),
+                 gOFS->mRecycler->GetKeepRatio());
         oss_out << sline << std::endl;
       }
     }

mgm/recycle/Recycle.hh

@@ -57,19 +57,7 @@ public:
   static std::string gRecyclingPrefix;
   //! Attribute key defining a recycling location
   static std::string gRecyclingAttribute;
-  //! Attribute key defining the max. time a file stays in the garbage directory
-  static std::string gRecyclingTimeAttribute;
-  //! Ratio from 0 ..1.0 defining a threshold when the recycle bin is not yet
-  //! cleaned even if files have expired their lifetime attributel.
-  static std::string gRecyclingKeepRatio;
-  //! Postfix which identifies a name in the garbage bin as a bulk deletion of a directory
   static std::string gRecyclingPostFix;
-  //! Attribute defining how often the collection of entries is attempted
-  static std::string gRecyclingCollectInterval;
-  //! Attribute defining how often the removeal of collected entries is attempted
-  static std::string gRecyclingRemoveInterval;
-  //! Attribute key defining whether the recycler runs in dry-run mode or not
-  static std::string gRecyclingDryRunAttribute;
   //! Attribute key storing the recycling key of the version directory
   //! belonging to a given file
   static std::string gRecyclingVersionKey;
@@ -158,6 +146,26 @@ public:
                      bool force_orig_name, bool restore_versions,
                      bool make_path = false);
 
+  //----------------------------------------------------------------------------
+  //! Get the configured keep time
+  //!
+  //! @return keep time in seconds
+  //----------------------------------------------------------------------------
+  inline uint64_t GetKeepTime() const
+  {
+    return mPolicy.mKeepTimeSec.load();
+  }
+
+  //----------------------------------------------------------------------------
+  //! Get the configured keep ratio
+  //!
+  //! @return keep ratio
+  //----------------------------------------------------------------------------
+  inline double GetKeepRatio() const
+  {
+    return mPolicy.mSpaceKeepRatio.load();
+  }
+
   //----------------------------------------------------------------------------
   //! Get recycle bin path from the given restore key information
   //!
@@ -237,7 +245,9 @@ public:
   //----------------------------------------------------------------------------
   //! Default constructor
   //----------------------------------------------------------------------------
-  Recycle(bool fake_clock = false);
+  Recycle(bool fake_clock = false):
+    mClock(fake_clock)
+  {}
 
   //----------------------------------------------------------------------------
   //! Destructor
@@ -315,19 +325,11 @@ public:
     return mPolicy.mEnforced.load();
   }
 
-
-
 private:
 #ifdef IN_TEST_HARNESS
 public:
 #endif
   AssistedThread mThread; ///< Thread doing the recycling
-  std::string mPath; ///< Path of file to be recycled
-  std::string mRecycleDir;
-  std::string mRecyclePath; ///< Final path of file in the recycle bin
-  uid_t mOwnerUid;
-  gid_t mOwnerGid;
-  unsigned long long mId;
   RecyclePolicy mPolicy;
   //! Map holding the container identifier and the full path of the directories
   //! to be deleted.