merge 5.8.4 patches

.github/workflows/CI.yml

@@ -92,7 +92,6 @@ jobs:
       run: |
         tests/post-install.sh
         tests/check-headers.sh
-
   alma8:
     name: Alma 8
     runs-on: ubuntu-latest

VERSION

@@ -1 +1 @@
-$Format:%(describe)$
+v5.8.2

packaging/makesrpm.sh

@@ -125,6 +125,11 @@ echo "[i] Working with version: $VERSION"
 # Sanitize version to work with RPMs
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/
 #-------------------------------------------------------------------------------
+RELEASE=4
+if test x`echo $VERSION | grep -E $RCEXP` != x; then
+  RELEASE=0.`echo $VERSION | sed 's/.*-rc/rc/'`
+  VERSION=`echo $VERSION | sed 's/-rc.*//'`
+fi
 
 VERSION=${VERSION#v} # remove "v" prefix
 VERSION=${VERSION/-rc/~rc} # release candidates use ~ in RPMs

src/XrdCeph/CMakeLists.txt

@@ -13,12 +13,15 @@ else()
   endif()
 endif()
 
+include_directories( ${RADOS_INCLUDE_DIR} )
+
 set(BUILD_CEPH TRUE CACHE BOOL INTERNAL FORCE)
 
 add_library(XrdCephPosix SHARED
   XrdCephPosix.cc XrdCephPosix.hh
   XrdCephBulkAioRead.cc XrdCephBulkAioRead.hh)
 
+
 target_compile_options(XrdCephPosix
   PRIVATE -Wno-deprecated-declarations)
 
@@ -29,7 +32,7 @@ target_include_directories(XrdCephPosix
   PUBLIC ${RADOS_INCLUDE_DIR} $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
 
 set_target_properties(XrdCephPosix
-  PROPERTIES VERSION 0.0.1 SOVERSION 0)
+  PROPERTIES VERSION 5.7.0 SOVERSION 0)
 
 set(LIB_XRD_CEPH XrdCeph-${PLUGIN_VERSION})
 
@@ -50,7 +53,7 @@ add_library(${LIB_XRD_CEPH} MODULE
 )
 
 target_link_libraries(${LIB_XRD_CEPH}
-  PRIVATE XrdCephPosix XrdUtils XrdServer ${RADOS_LIBS})
+  PRIVATE ${XROOTD_LIBRARIES} XrdCephPosix XrdUtils XrdServer ${RADOS_LIBS})
 
 set(LIB_XRD_CEPH_XATTR XrdCephXattr-${PLUGIN_VERSION})
 

src/XrdCeph/XrdCephOss.cc

@@ -28,21 +28,21 @@
 #include <fcntl.h>
 #include <limits.h>
 
-#include "XrdVersion.hh"
-#include "XrdCeph/XrdCephOss.hh"
-#include "XrdCeph/XrdCephOssDir.hh"
-#include "XrdCeph/XrdCephOssFile.hh"
+#include <chrono>
 #include "XrdCeph/XrdCephPosix.hh"
-#include "XrdCeph/XrdCephOssBufferedFile.hh"
-#include "XrdCeph/XrdCephOssReadVFile.hh"
-
 #include "XrdOuc/XrdOucEnv.hh"
 #include "XrdSys/XrdSysError.hh"
 #include "XrdSys/XrdSysPlatform.hh"
 #include "XrdOuc/XrdOucTrace.hh"
 #include "XrdOuc/XrdOucStream.hh"
 #include "XrdOuc/XrdOucName2Name.hh"
 #include "XrdOuc/XrdOucN2NLoader.hh"
+#include "XrdVersion.hh"
+#include "XrdCeph/XrdCephOss.hh"
+#include "XrdCeph/XrdCephOssDir.hh"
+#include "XrdCeph/XrdCephOssFile.hh"
+#include "XrdCeph/XrdCephOssBufferedFile.hh"
+#include "XrdCeph/XrdCephOssReadVFile.hh"
 
 XrdVERSIONINFO(XrdOssGetStorageSystem, XrdCephOss);
 
@@ -115,7 +115,7 @@ ssize_t getNumericAttr(const char* const path, const char* attrName, const int m
   if (attrLen <= 0) {
     retval = -EINVAL;
   } else {
-    attrValue[attrLen] = '\0';
+    attrValue[attrLen] = (char)'\0';
     char *endPointer = (char *)NULL;
     retval = strtoll(attrValue, &endPointer, 10);
   }
@@ -127,6 +127,9 @@ ssize_t getNumericAttr(const char* const path, const char* attrName, const int m
   return retval;
 
 }
+char *g_cksLogFileName;
+
+extern FILE *g_cksLogFile;
 
 extern "C"
 {
@@ -165,6 +168,12 @@ XrdCephOss::~XrdCephOss() {
 extern unsigned int g_maxCephPoolIdx;
 extern unsigned int g_cephAioWaitThresh;
 
+bool g_calcStreamedAdler32;
+bool g_storeStreamedAdler32;
+bool g_logStreamedAdler32;
+
+
+
 int XrdCephOss::Configure(const char *configfn, XrdSysError &Eroute) {
    int NoGo = 0;
    XrdOucEnv myEnv;
@@ -348,7 +357,7 @@ int XrdCephOss::Configure(const char *configfn, XrdSysError &Eroute) {
            if (!Config.GetRest(parms, sizeof(parms)) || parms[0]) {
              Eroute.Emsg("Config", "readvalgname parameters will be ignored");
            }
-          m_configBufferIOmode = var; // allowed values would be aio, io
+          m_configBufferIOmode = var; // allowed values would be aio, io, write-only-io
          } else {
            Eroute.Emsg("Config", "Missing value for ceph.bufferiomode in config file", configfn);
            return 1;
@@ -361,19 +370,78 @@ int XrdCephOss::Configure(const char *configfn, XrdSysError &Eroute) {
            m_configPoolnames = var;
          } else {
            Eroute.Emsg("Config", "Missing value for ceph.reportingpools in config file", configfn);
-           return 1; 
+           return 1;
+         }
+       }
+       if (!strcmp(var, "ceph.streamed-cks-adler32")) { // Streaming Adler32 checksum
+
+         var = Config.GetWord();
+         if (var) {
+/*
+ * Currently, actions are simply additive:
+ *
+ * Store implies calculate, log, store
+ * Log   implies calculate, log
+ * Calc  implies calculate
+ *
+ * Might want to make e.g. logging optional in the future,
+ * when storing is more prevalent.
+ *
+ * Instead of setting g_* flags in three conditionals,
+ * can switch to setting values in a single bitfield flag
+ *
+ */
+           if (strstr(var, "calc")) {
+	       g_calcStreamedAdler32 = true;
+               g_logStreamedAdler32 = false;
+	       g_storeStreamedAdler32 = false;
+           }
+           if (strstr(var, "log")) {
+	       g_calcStreamedAdler32 = true;
+               g_logStreamedAdler32 = true;
+	       g_storeStreamedAdler32 = false;
+           }
+           if (strstr(var, "store")) {
+	       g_calcStreamedAdler32 = true;
+               g_logStreamedAdler32 = true;
+	       g_storeStreamedAdler32 = true;
+           }
+
          }
-       }       
-     } // while
+       }// "ceph.streamed-cks-adler32"
 
-     // Now check if any errors occurred during file i/o
+       if (!strcmp(var, "ceph.streamed-cks-logfile") ) {
+         var = Config.GetWord();
+	 if (var) { 
+           g_cksLogFileName = strdup(var);
+         } else {
+           const char *defLogFileName = "/tmp/checksums.log"; // To-DO: Move defLogFileName so it can also be used as fallback 
+	                                                      //  when attempt to open specified log file below fails
+           Eroute.Emsg("Config", "Missing value for ceph.streamed-cks-logfile in config file, setting to default = ", defLogFileName);
+	   g_cksLogFileName = strdup(defLogFileName);
+ 	   return 1;
+         }
+       }// "ceph.streamed-cks-logfile"
 
+     }
+     // Now check if any errors occured during file i/o
      int retc = Config.LastError();
      if (retc) {
        NoGo = Eroute.Emsg("Config", -retc, "read config file",
                           configfn);
      }
      Config.Close();
+
+     if (g_logStreamedAdler32) {
+       if (NULL == (g_cksLogFile = fopen(g_cksLogFileName, "a"))) {
+         g_logStreamedAdler32 = false;
+         Eroute.Emsg("Config: ", "cannot open file for logging checksum values and pathname", g_cksLogFileName);
+	 return 1;
+       } else {
+	 Eroute.Emsg("Config: ", "Opened file for logging checksum values and pathname: ", g_cksLogFileName);
+       }
+     }
+
    }
    return NoGo;
 }

src/XrdCeph/XrdCephOss.hh

@@ -26,9 +26,7 @@
 #define __CEPH_OSS_HH__
 
 #include <string>
-
 #include <XrdOss/XrdOss.hh>
-#include <XrdSys/XrdSysError.hh>
 
 //------------------------------------------------------------------------------
 //! This class implements XrdOss interface for usage with a CEPH storage.

src/XrdCeph/XrdCephOssBufferedFile.cc

@@ -151,6 +151,10 @@ ssize_t XrdCephOssBufferedFile::Read(off_t offset, size_t blen) {
 ssize_t XrdCephOssBufferedFile::Read(void *buff, off_t offset, size_t blen) {
   size_t thread_id = std::hash<std::thread::id>{}(std::this_thread::get_id());
 
+  if (m_bufferIOmode == "write-only-io") {
+    return m_xrdOssDF->Read(buff, offset, blen);
+  }
+
   IXrdCephBufferAlg * buffer{nullptr};
   // check for, and create if needed, a buffer
   {
@@ -326,11 +330,12 @@ std::unique_ptr<XrdCephBuffer::IXrdCephBufferAlg> XrdCephOssBufferedFile::create
       std::unique_ptr<ICephIOAdapter>     cephio;
       if (m_bufferIOmode == "aio") {
           cephio = std::unique_ptr<ICephIOAdapter>(new CephIOAdapterAIORaw(cephbuffer.get(),m_fd));
-      } else if (m_bufferIOmode == "io") {
+      } else if (m_bufferIOmode == "io" || m_bufferIOmode == "write-only-io") {
           cephio = std::unique_ptr<ICephIOAdapter>(new CephIOAdapterRaw(cephbuffer.get(),m_fd,
                                                   !m_cephoss->m_useDefaultPreadAlg));
       } else {
-            BUFLOG("XrdCephOssBufferedFile: buffer mode needs to be one of aio|io " );
+            BUFLOG("XrdCephOssBufferedFile: buffer mode needs to be one of aio|io|write-only-io " );
+
             m_xrdOssDF->Close();
             return bufferAlg; // invalid instance;
       }