FST: Update read conversion to support NFS backend - namely the local file rename

functionality which is used as part of the conversion process.

Author: esindril

fst/CMakeLists.txt

@@ -128,7 +128,7 @@ set_target_properties(Jerasure-Objects PROPERTIES
 #-------------------------------------------------------------------------------
 add_library(EosFstIo-Objects OBJECT
   # File IO interface
-  io/FileIo.hh
+  io/FileIo.cc                   io/FileIo.hh
   io/local/FsIo.cc               io/local/FsIo.hh
   io/davix/DavixIo.cc            io/davix/DavixIo.hh
   io/nfs/NfsIo.cc                io/nfs/NfsIo.hh

fst/XrdFstOfs.cc

@@ -33,6 +33,9 @@
 #include "fst/Deletion.hh"
 #include "fst/Verify.hh"
 #include "fst/utils/XrdOfsPathHandler.hh"
+#ifdef HAVE_NFS
+#include "fst/io/nfs/NfsIo.hh"
+#endif
 #include "common/Utils.hh"
 #include "common/PasswordHandler.hh"
 #include "common/FileId.hh"
@@ -659,8 +662,9 @@ XrdFstOfs::Configure(XrdSysError& Eroute, XrdOucEnv* envP)
                         "an absolute path like /etc/grid-security/jwt-token-grpc");
             NoGo = 1;
           } else {
-              gConfig.JwtTokenPath = val;
+            gConfig.JwtTokenPath = val;
           }
+
           Eroute.Say("=====> fstofs.jwttokenpath : ", val);
         }
 
@@ -1768,7 +1772,7 @@ XrdFstOfs::FSctl(const int cmd, XrdSfsFSctl& args, XrdOucErrInfo& error,
       // Check that new path doesn't exist already
       struct stat info;
 
-      if (::stat(new_path.c_str(), &info) == 0) {
+      if (FileIo::fsStat(new_path.c_str(), info) == 0) {
         eos_static_err("msg=\"new path already exists on filesystem\" "
                        "fsid=%08llx new_path=%s", fsid, new_path.c_str());
         return gOFS.Emsg(epname, error, EEXIST, "do local rename", "");
@@ -1789,12 +1793,12 @@ XrdFstOfs::FSctl(const int cmd, XrdSfsFSctl& args, XrdOucErrInfo& error,
         return gOFS.Emsg(epname, error, EEXIST, "do local rename", "");
       }
 
-      if (::rename(old_path.c_str(), new_path.c_str())) {
+      if (FileIo::fsRename(old_path, new_path) != 0) {
         eos_static_err("msg=\"rename failed\" old_path=%s new_path=%s errno=%d",
                        old_path.c_str(), new_path.c_str(), errno);
         return gOFS.Emsg(epname, error, EEXIST, "do local rename", "");
       } else {
-        // Update the filemd info to point to the origianl file identifier
+        // Update the filemd info to point to the original fille identifier
         if (!mFmdHandler->UpdateFmd(new_path, new_fid)) {
           eos_static_err("msg=\"failed to update fid for the fmd object\" "
                          "path=%s new_fid=%08llx", new_path.c_str(), new_fid);
@@ -2075,10 +2079,15 @@ XrdFstOfs::UpdateTpcKeyValidity()
 // Create directory hierarchy
 //------------------------------------------------------------------------------
 bool
-XrdFstOfs::CreateDirHierarchy(const std::string& dir_hierarchy,
+XrdFstOfs::CreateDirHierarchy(std::string dir_hierarchy,
                               mode_t mode) const
 {
   struct stat info;
+
+  if (dir_hierarchy.find("nfs:/") == 0) {
+    dir_hierarchy.erase(0, 5);
+  }
+
   std::string path = "/";
   auto lst_dirs = eos::common::StringTokenizer::split<std::list<std::string>>
                   (dir_hierarchy, '/');

fst/XrdFstOfs.hh

@@ -533,8 +533,7 @@ public:
   //!
   //! @return true if successful, otherwise false
   //----------------------------------------------------------------------------
-  bool CreateDirHierarchy(const std::string& dir_hierarchy,
-                          mode_t mode) const;
+  bool CreateDirHierarchy(std::string dir_hierarchy, mode_t mode) const;
 
   //----------------------------------------------------------------------------
   //! Handle debug query

fst/io/FileIo.cc

@@ -0,0 +1,48 @@
+//------------------------------------------------------------------------------
+//! @file FileIo.cc
+//! @author Elvin-Alin Sindrilaru <esindril@cern.ch>
+//! @brief Abstract class modelling an IO plugin
+//------------------------------------------------------------------------------
+
+/************************************************************************
+ * EOS - the CERN Disk Storage System                                   *
+ * Copyright (C) 2025 CERN/Switzerland                                  *
+ *                                                                      *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 3 of the License, or    *
+ * (at your option) any later version.                                  *
+ *                                                                      *
+ * This program is distributed in the hope that it will be useful,      *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
+ * GNU General Public License for more details.                         *
+ *                                                                      *
+ * You should have received a copy of the GNU General Public License    *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.*
+ ************************************************************************/
+
+#include "fst/io/FileIo.hh"
+#ifdef HAVE_NFS
+#include "fst/io/nfs/NfsIo.hh"
+#endif
+
+EOSFSTNAMESPACE_BEGIN
+
+//--------------------------------------------------------------------------
+//! Rename operation
+//--------------------------------------------------------------------------
+int FileIo::fsRename(std::string old_path, std::string new_path)
+{
+  if ((old_path.find("nfs:/") == 0) || (new_path.find("nfs:/") == 0)) {
+#ifdef HAVE_NFS
+    return NfsIo::fsRename(old_path, new_path);
+#endif
+    eos_static_crit("%s", "msg=\"no NFS built-in support!\"");
+    return ENOTSUP;
+  }
+
+  return ::rename(old_path.c_str(), new_path.c_str());
+}
+
+EOSFSTNAMESPACE_END

fst/io/FileIo.hh

@@ -65,6 +65,32 @@ public:
   //--------------------------------------------------------------------------
   virtual ~FileIo() {}
 
+  //--------------------------------------------------------------------------
+  //! Get stat information about the file
+  //!
+  //! @param path file path (can contain protocol specific info eg. nfs://)
+  //!
+  //! @return 0 if successful, otherwise non-zero
+  //--------------------------------------------------------------------------
+  static int fsStat(std::string path, struct stat& info)
+  {
+    if (path.find("nfs:/") == 0) {
+      path.erase(0, 5); // remove "nfs:/" prefix
+    }
+
+    return ::stat(path.c_str(), &info);
+  }
+
+  //--------------------------------------------------------------------------
+  //! Rename operation
+  //!
+  //! @param old_path old path
+  //! @param new_path new path
+  //!
+  //! @return 0 if successful, otherwise non-zero
+  //--------------------------------------------------------------------------
+  static int fsRename(std::string old_path, std::string new_path);
+
   //--------------------------------------------------------------------------
   //! Open file
   //!