Alicepoolfix

VERSION

@@ -1 +1 @@
-v5.8.2
+v5.8.4

src/XrdCeph/XrdCephOss.cc

@@ -168,10 +168,10 @@ XrdCephOss::~XrdCephOss() {
 extern unsigned int g_maxCephPoolIdx;
 extern unsigned int g_cephAioWaitThresh;
 
-bool g_calcStreamedAdler32;
-bool g_storeStreamedAdler32;
-bool g_logStreamedAdler32;
-
+extern bool g_calcStreamedAdler32;
+extern bool g_storeStreamedAdler32;
+extern bool g_logStreamedAdler32;
+extern double g_ECcorrectionFactor; // correction factor to apply to used space when EC pools are used, to get a better estimate of actual used space
 
 
 int XrdCephOss::Configure(const char *configfn, XrdSysError &Eroute) {
@@ -372,7 +372,26 @@ int XrdCephOss::Configure(const char *configfn, XrdSysError &Eroute) {
            Eroute.Emsg("Config", "Missing value for ceph.reportingpools in config file", configfn);
            return 1;
          }
+         // EC correction factor for pool reporting
+         if (!strncmp(var, "ceph.ECcorrectionFactor", 23)) { // size in bytes
+           var = Config.GetWord();
+           if (var) {
+             double value = strtod(var, 0);
+             if (value > 0 and value <= 1) {
+               g_ECcorrectionFactor = value;
+               Eroute.Emsg("Config", "ceph.ECcorrectionFactor", std::to_string(g_ECcorrectionFactor).c_str() ); 
+             } else {
+               Eroute.Emsg("Config", "Invalid value for ceph.ECcorrectionFactor in config file; enter a value between 0 and 1", configfn, var);
+               return 1;
+             }
+         } else {
+           Eroute.Emsg("Config", "Missing value for ceph.ECcorrectionFactor in config file. Setting default 8/11", configfn);
+	   g_ECcorrectionFactor = 0.727272; // default 8/11 EC correction factor
+           return 1;
+           }
+         }
        }
+
        if (!strcmp(var, "ceph.streamed-cks-adler32")) { // Streaming Adler32 checksum
 
          var = Config.GetWord();
@@ -674,20 +693,16 @@ int XrdCephOss::StatLS(XrdOucEnv &env, const char *charPath, char *buff, int &bl
       XrdCephEroute.Say("Failed to get used space in pool ", spath.c_str());
       return -EINVAL;
   }
-
   // Construct the object path
   std::string spaceInfoPath =  spath + ":" +  (const char *)"__spaceinfo__";
   totalSpace = getNumericAttr(spaceInfoPath.c_str(), "total_space", 24);
   if (totalSpace < 0) {
     XrdCephEroute.Say("Could not get 'total_space' attribute from ", spaceInfoPath.c_str());
     return -EINVAL;
-  }
-
+  }  
 //
 // Figure for 'usedSpace' already accounts for Erasure Coding overhead
 //
-
-
   freeSpace = totalSpace - usedSpace;
   blen = formatStatLSResponse(buff, blen, 
     spath.c_str(),       /* "oss.cgroup" */ 
@@ -747,3 +762,4 @@ XrdOssDF* XrdCephOss::newFile(const char *tident) {
   return xrdCephOssDF;
 }
 
+

src/XrdCeph/XrdCephPosix.cc

@@ -67,7 +67,7 @@
     return strdup(timeString);
 }
 
 constexpr char hex2ascii(char nibble)   { return (0<= nibble && nibble<=9) ? nibble+'0' : nibble-10+'a'; }
 constexpr char hiNibble(uint8_t hexbyte) { return (hexbyte & 0xf0) >> 4; }
 constexpr char loNibble(uint8_t hexbyte) { return (hexbyte & 0x0f); }
 
@@ -156,12 +156,10 @@
 std::map<unsigned int, unsigned long long> g_idxCntr;
 
 //IJJ: Actions for Adler32 checksum
-extern bool g_calcStreamedAdler32;
-bool g_calcStreamedAdler32 = false;
-extern bool g_logStreamedAdler32;
-bool g_logStreamedAdler32 = false;
-extern bool g_storeStreamedAdler32; 
-bool g_storeStreamedAdler32 = false;
+bool g_calcStreamedAdler32;
+bool g_logStreamedAdler32;
+bool g_storeStreamedAdler32; 
+double g_ECcorrectionFactor; 
 
 FILE *g_cksLogFile;
 
@@ -645,7 +643,7 @@
     IOCtxDict & ioDict = g_ioCtx[cephPoolIdx];
     ioDict.insert(std::pair<std::string, librados::IoCtx*>(userAtPool, ioctx));
     sDict.insert(std::pair<std::string, libradosstriper::RadosStriper*>
                  (userAtPool, striper)).first;
   }
   return 1;
 } 
@@ -1638,7 +1636,7 @@
 
   } else {
 
-    *usedSpace = stat[poolName].num_kb * 1024;
+    *usedSpace = stat[poolName].num_kb * 1024 * g_ECcorrectionFactor; // num_kb is in KB, convert to bytes and apply EC correction factor
     return XrdOssOK;
 
   }
@@ -1756,3 +1754,4 @@
   delete ((DirIterator*)dirp);
   return 0;
 }
+

xrootd.spec

@@ -9,7 +9,7 @@
 
 Name:		xrootd
 Epoch:		1
-Release:	96%{?dist}%{?with_clang:.clang}%{?with_asan:.asan}%{?with_openssl11:.ssl11}
+Release:	92%{?dist}%{?with_clang:.clang}%{?with_asan:.asan}%{?with_openssl11:.ssl11}
 Summary:	Extended ROOT File Server
 Group:		System Environment/Daemons
 License:	LGPL-3.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND curl AND MIT AND Zlib