MGM: Quota recomputation that affects the namespace quota should also trigger a refresh of the space quota - all while making sure stall entries from the space quota are removed before applying the ns quota updates.

Author: tavisit

mgm/proc/admin/NsCmd.cc

@@ -950,8 +950,14 @@ NsCmd::QuotaSizeSubcmd(const eos::console::NsProto_QuotaSizeProto& tree,
                cont_id, cont_uri.c_str());
     } else {
       quotaNode->replaceCore(qnc);
-      eos_info("msg=\"quota recomputation successful\" cxid=%08llx path=\"%s\"",
-               cont_id, cont_uri.c_str());
+      if (Quota::RefreshFromNsQuota(cont_uri)) {
+        eos_info("msg=\"quota recomputation successful\" cxid=%08llx path=\"%s\"",
+                 cont_id, cont_uri.c_str());
+      } else {
+        eos_warning("msg=\"quota recomputation failed to refresh SpaceQuota\" "
+                    "cxid=%08llx path=\"%s\"",
+                    cont_id, cont_uri.c_str());
+      }
     }
   } catch (const eos::MDException& e) {
     eos_err("msg=\"quota recomputation failed, directory removed\" "

mgm/quota/Quota.cc

@@ -2395,4 +2395,43 @@ Quota::AddFile(eos::IFileMD::id_t fid)
   return false;
 }
 
+//------------------------------------------------------------------------------
+// Force refresh of space quota from namespace quota node
+//------------------------------------------------------------------------------
+bool
+Quota::RefreshFromNsQuota(const std::string& path)
+{
+  eos::common::RWMutexReadLock rd_quota_lock(pMapMutex);
+  SpaceQuota* squota = GetResponsibleSpaceQuota(path);
+
+  if (!squota || squota->GetSpaceNameStr().compare(path)) {
+    return false;
+  }
+
+  {
+    XrdSysMutexHelper scope_lock(squota->mMutex);
+    auto it = squota->mMapIdQuota.begin();
+    while (it != squota->mMapIdQuota.end()) {
+      unsigned long tag = squota->UnIndex(it->first);
+
+      // Only remove "Is" tags
+      if (tag == SpaceQuota::kUserBytesIs || tag == SpaceQuota::kUserLogicalBytesIs ||
+          tag == SpaceQuota::kUserFilesIs || tag == SpaceQuota::kGroupBytesIs ||
+          tag == SpaceQuota::kGroupLogicalBytesIs || tag == SpaceQuota::kGroupFilesIs ||
+          tag == SpaceQuota::kAllUserBytesIs ||
+          tag == SpaceQuota::kAllUserLogicalBytesIs ||
+          tag == SpaceQuota::kAllUserFilesIs || tag == SpaceQuota::kAllGroupBytesIs ||
+          tag == SpaceQuota::kAllGroupLogicalBytesIs ||
+          tag == SpaceQuota::kAllGroupFilesIs) {
+        it = squota->mMapIdQuota.erase(it);
+      } else {
+        ++it;
+      }
+    }
+  }
+  squota->Refresh(0);
+
+  return true;
+}
+
 EOSMGMNAMESPACE_END

mgm/quota/Quota.hh

@@ -641,6 +641,14 @@ public:
   //----------------------------------------------------------------------------
   static bool AddFile(eos::IFileMD::id_t fid);
 
+  //----------------------------------------------------------------------------
+  //! Force refresh of space quota from namespace quota node
+  //!
+  //! @param path quota node path
+  //!
+  //! @return true if refresh successful, otherwise false
+  //----------------------------------------------------------------------------
+  static bool RefreshFromNsQuota(const std::string& path);
 
   static gid_t gProjectId; ///< gid indicating project quota
   static eos::common::RWMutex pMapMutex; ///< Protect access to pMapQuota