Add CTest for XRootd Remote support

Author: eisenhauer

cmake/DetectOptions.cmake

@@ -583,6 +583,16 @@ elseif(ADIOS2_USE_XRootD)
 endif()
 if(XRootD_FOUND)
   set(ADIOS2_HAVE_XRootD TRUE)
+  FIND_PROGRAM( XROOTD_SERVER_BINARY xrootd
+  		HINTS
+		${XROOTD_DIR}
+		$ENV{XROOTD_DIR}
+		/usr
+		/opt/xrootd
+		PATH_SUFFIXES bin
+		)
+		message (STATUS "xrootd server binary is ${XROOTD_SERVER_BINARY}")
+
 endif()
 
 # Campaign Management

source/adios2/toolkit/remote/XrootdRemote.cpp

@@ -134,9 +134,8 @@ void myRequest::Alert(XrdSsiRespInfoMsg &aMsg)
 
     // Print what we received
     //
-    //    fprintf(XrdSsiCl::outFile, "%s@%s: Rcvd %d bytes alert: '%s'\n", rName,
-    //    GetEndPoint().c_str(),
-    //            theMsz, theMsg);
+    fprintf(XrdSsiCl::outFile, "%s@%s: Rcvd %d bytes alert: '%s'\n", rName, GetEndPoint().c_str(),
+            theMsz, theMsg);
 
     // Recycle the message
     //

source/utils/xrootd-plugin/AdiosFilePool.cpp

@@ -10,7 +10,6 @@ AnonADIOSFile *ADIOSFilePool::GetFree(std::string Filename, bool RowMajorArrays)
     auto res = map.find(index);
 
     SubPool *subpool;
-    AnonADIOSFile *ret;
     if (res != map.end())
     {
         subpool = res->second.get();

source/utils/xrootd-plugin/XrdSsiSvService.cpp

@@ -64,13 +64,6 @@ using namespace std;
 
 namespace
 {
-void *SvWecho(void *svP)
-{
-    XrdSsiSvService *sessP = (XrdSsiSvService *)svP;
-    sessP->doWecho();
-    return 0;
-}
-
 void *SvAdiosGet(void *svP)
 {
     XrdSsiSvService *sessP = (XrdSsiSvService *)svP;
@@ -501,7 +494,6 @@ void XrdSsiSvService::ProcessRequest4Me(XrdSsiRequest *rqstP)
         pthread_t tid;
         auto engine = poolEntry->m_engine;
         auto io = poolEntry->m_io;
-        auto var = io.InquireVariable(VarName);
         adios2::Box<adios2::Dims> varSel(Start, Count);
         adios2::DataType TypeOfVar = io.InquireVariableType(VarName);
         try
@@ -569,11 +561,9 @@ int XrdSsiSvService::Copy2Buff(char *dest, int dsz, const char *src, int ssz)
 
 void XrdSsiSvService::Respond(const char *rData, const char *mData)
 {
-    XrdSsiResponder::Status rc;
-    int rLen;
-
     throw std::logic_error("Respond shouldn't be called");
 }
+
 void XrdSsiSvService::AdiosRespond(const char *rData, const char *mData)
 {
     XrdSsiResponder::Status rc;

source/utils/xrootd-plugin/XrdSsiSvService.hh

@@ -44,20 +44,11 @@
 class XrdSsiSvService : public XrdSsiService, public XrdSsiResponder
 {
 public:
-    //-----------------------------------------------------------------------------
-    //! Attach to a previously detached server-side request.
-    //-----------------------------------------------------------------------------
-
-    virtual void Attach(XrdSsiRequest &reqRef, std::string handle) {}
-
     //-----------------------------------------------------------------------------
     //! Do delayed echo (internal)
     //-----------------------------------------------------------------------------
 
-    void doWecho()
-    {
-        Respond(m_responseBuffer, m_respMeta);
-    }
+    void doWecho() { Respond(m_responseBuffer, m_respMeta); }
 
     void doAdiosGet() { AdiosRespond(m_responseBuffer, m_respMeta); }
 
@@ -103,7 +94,7 @@ protected:
     //! Destructor is protected. You cannot use delete on a service, use the
     //! Stop() method to effectively delete the service object.
     //-----------------------------------------------------------------------------
-  ~XrdSsiSvService();
+    ~XrdSsiSvService();
 
 private:
     int Copy2Buff(char *dest, int dsz, const char *src, int ssz);
@@ -118,7 +109,7 @@ private:
     static int alertNum;
     char *sName;
     char *m_responseBuffer = NULL;
-    int m_responseBufferSize = 0;
+    size_t m_responseBufferSize = 0;
     char m_respMeta[512];
     char m_respData[1024];
     int streamRdSz;

testing/adios2/engine/bp/CMakeLists.txt

@@ -134,6 +134,26 @@ if ((NOT WIN32) AND ADIOS2_HAVE_SST)
    add_file_remote_tests_helper(WriteMemorySelectionRead)
 endif()
 
+if (ADIOS2_HAVE_XRootD)
+   macro(add_get_xrremote_tests_helper testname)
+      add_test(NAME "Remote.BP${testname}.GetXRRemote" COMMAND Test.Engine.BP.${testname}.Serial bp5)
+      set_tests_properties(Remote.BP${testname}.GetXRRemote PROPERTIES FIXTURES_REQUIRED XRServer ENVIRONMENT "DoXRootD=1")
+   endmacro()
+
+   add_test(NAME generateXRootDConfig COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/generateXRootDConfig.sh $<TARGET_FILE:adios2_xrootd>  )
+   add_test(NAME remoteXRServerSetup   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/start_xrootd.sh ${XROOTD_SERVER_BINARY} ${CMAKE_CURRENT_BINARY_DIR})
+
+   set_tests_properties(remoteXRServerSetup         PROPERTIES FIXTURES_SETUP    XRServer)
+   set_tests_properties(remoteXRServerSetup PROPERTIES DEPENDS "generateXRootDConfig")
+
+   add_test(NAME remoteXRServerCleanup COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/kill_xrootd.sh )
+   set_tests_properties(remoteXRServerCleanup         PROPERTIES FIXTURES_CLEANUP    XRServer)
+
+   ##### add remote tests below this line
+   add_get_xrremote_tests_helper(WriteReadADIOS2stdio)
+   add_get_xrremote_tests_helper(WriteMemorySelectionRead)
+endif()
+
 if(ADIOS2_HAVE_MPI)
   list(APPEND BP5LargeMeta "Engine.BP.BPLargeMetadata.BPWrite1D_LargeMetadata.BP5.MPI" "Engine.BP.BPLargeMetadata.ManyLongStrings.BP5.MPI")
 endif()

testing/adios2/engine/bp/generateXRootDConfig.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+echo "First arg is $1"
+mkdir -p xroot/var/spool
+mkdir -p xroot/run/xrootd
+mkdir -p xroot/etc/xrootd
+{
+    echo "xrootd.fslib libXrdSsi.so";
+    echo ""
+    echo "all.export /home/eisen/xroot/data nolock r/w";
+    echo ""
+    echo "oss.statlib -2 libXrdSsi.so";
+    echo ""
+    echo "ssi.svclib $1";
+    echo ""
+} > xroot/etc/xrootd/xrootd-ssi.cfg

testing/adios2/engine/bp/kill_xrootd.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+kill -2 "$(cat /tmp/xrootd.pid)"
+#rm /tmp/xrootd.pid

testing/adios2/engine/bp/start_xrootd.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ "$(id -u)" -eq 0 ]; then
+    # we run as root in CI in docker images, this is OK, but we have to tell XRootD that it's OK.
+    ROOT_ARGS="-R sshd"
+fi
+"$1" -b -l /tmp/xroot.log "$ROOT_ARGS" -w "$2" -c "$2"/xroot/etc/xrootd/xrootd-ssi.cfg