MGM/FST: Add mechanism to register recovered stripes for RAIN files that are

not the ones at the entry server. This scenario covers the cases for under-
replicated RAIN files. During recovery the entry server is the only one
allowed to register/drop stripes and this the only place where we know for
sure if the transfer was successful or not - this is why the other stripes
can not commit this information themselves.

Author: esindril

fst/XrdFstOfsFile.cc

@@ -1904,7 +1904,7 @@ XrdFstOfsFile::_close_wr()
   }
 
   // Commit to MGM in case of rain reconstruction and not del on close
-  if (mRainReconstruct && !mDelOnClose) {
+  if (mRainReconstruct && mLayout->IsEntryServer() && !mDelOnClose) {
     if ((rc = CommitToMgm())) {
       if ((error.getErrInfo() == EIDRM) ||
           (error.getErrInfo() == EBADE) ||
@@ -3980,6 +3980,7 @@ XrdFstOfsFile::NotifyProtoWfEndPointClosew(uint64_t file_id,
   cta::xrd::Response response;
   cta::xrd::Response::ResponseType response_type =
     cta::xrd::Response::RSP_INVALID;
+
   auto root_certs = gOFS.ConcatenatedServerRootCA;
 
   try {
@@ -4268,6 +4269,7 @@ XrdFstOfsFile::CommitToMgm()
 {
   using eos::common::StringConversion;
   std::ostringstream oss;
+  bool added_fsid = false;
   const std::string smtime = StringConversion::GetSizeString((unsigned long long)
                              (mForcedMtime != 1) ?
                              mForcedMtime :
@@ -4284,7 +4286,6 @@ XrdFstOfsFile::CommitToMgm()
       << "&mgm.size=" << mCloseSize
       << "&mgm.mtime=" << smtime
       << "&mgm.mtime_ns=" << smtime_ns
-      << "&mgm.add.fsid=" << mFmd->mProtoFmd.fsid()
       << "&mgm.logid=" << logId;
 
   if (mCheckSum) {
@@ -4318,7 +4319,25 @@ XrdFstOfsFile::CommitToMgm()
       ptr = mOpenOpaque->Get("eos.pio.recfs");
 
       if ((mHasReadErr == false) && ptr) {
-        oss << "&mgm.drop.fsid=" << ptr;
+        if (strncmp(ptr, "0", 1) == 0) {
+          // Rain reconstruction with possibly adding new fses which
+          // are present in the opaque information
+          ptr = mOpenOpaque->Get("eos.pio.addfs");
+
+          if (ptr) {
+            oss << "&mgm.add.fsid=";
+            std::vector<std::string> fsid_tokens;
+            eos::common::StringConversion::Tokenize(ptr, fsid_tokens, ",");
+
+            for (auto id : fsid_tokens) {
+              oss << id;
+              added_fsid = true;
+              break;
+            }
+          }
+        } else {
+          oss << "&mgm.drop.fsid=" << ptr;
+        }
       }
     }
   } else {
@@ -4349,6 +4368,10 @@ XrdFstOfsFile::CommitToMgm()
     }
   }
 
+  if (!added_fsid) {
+    oss << "&mgm.add.fsid=" << mFmd->mProtoFmd.fsid();
+  }
+
   // Evt. tag as an OC-Chunk commit
   if (mIsOCchunk) {
     oss << eos::common::OwnCloud::FilterOcQuery(mOpenOpaque->Env(envlen));

mgm/XrdMgmOfsFile.cc

@@ -3022,9 +3022,10 @@ XrdMgmOfsFile::open(eos::common::VirtualIdentity* invid,
     capability += (int) fs_id;
     eos::mgm::FileSystem* repfilesystem = 0;
     replacedfs.resize(selectedfs.size());
-
     // If replacement has been specified try to get new locations for
     // reconstruction or for missing stripes
+    std::set<unsigned int> add_new_fsid;
+
     if (isPioReconstruct && !(pio_reconstruct_fs.empty())) {
       const char* containertag = 0;
 
@@ -3078,7 +3079,7 @@ XrdMgmOfsFile::open(eos::common::VirtualIdentity* invid,
       plain_book_sz = std::ceil((float) plain_book_sz / std::pow(num_data_stripes,
                                 2)) *
                       num_data_stripes * LayoutId::GetBlocksize(layoutId) + LayoutId::OssXsBlockSize;
-      eos_info("msg=\"plain booking size is %llu", plain_book_sz);
+      eos_info("msg=\"plain booking size is %llu\"", plain_book_sz);
       eos::common::VirtualIdentity rootvid = eos::common::VirtualIdentity::Root();
       // Attempt to use a firewall entrypoint or a dataproxy if required, if any
       // of the two fail, then scheduling fails
@@ -3138,8 +3139,10 @@ XrdMgmOfsFile::open(eos::common::VirtualIdentity* invid,
       }
 
       for (size_t i = 0; i < selection_diff; ++i) {
-        selectedfs.push_back(pio_replacement_fs.back());
+        unsigned int fsid = pio_replacement_fs.back();
         pio_replacement_fs.pop_back();
+        selectedfs.push_back(fsid);
+        add_new_fsid.insert(fsid);
       }
     }
 
@@ -3339,6 +3342,18 @@ XrdMgmOfsFile::open(eos::common::VirtualIdentity* invid,
         infolog += ") ";
       }
     } // fs_rd_lock
+
+    if (isPioReconstruct && !add_new_fsid.empty()) {
+      std::string pio_addfs = "eos.pio.addfs=";
+
+      for (const auto& elem : add_new_fsid) {
+        pio_addfs += std::to_string(elem).c_str();
+        pio_addfs += ",";
+      }
+
+      pio_addfs.erase(pio_addfs.length() - 1, 1);
+      redirectionhost += pio_addfs.c_str();
+    }
   }
 
   // ---------------------------------------------------------------------------