Merge remote-tracking branch 'origin/candidate-9.6.x'

Signed-off-by: Gordon Smith <[email protected]>
AttilaVamos · Jun 20, 2024 · 63341d8 · 63341d8
2 parents 683bc67 + 57b53ea
commit 63341d8
Show file tree

Hide file tree

Showing 44 changed files with 4,691 additions and 2,192 deletions.
diff --git a/common/workunit/wujobq.cpp b/common/workunit/wujobq.cpp
@@ -1122,11 +1122,19 @@ class CJobQueue: public CJobQueueBase, implements IJobQueue
     void disconnect()   // signal no longer wil be dequeing (optional - done automatically on release)
     {
         Cconnlockblock block(this,true);
-        if (connected) {
+        if (connected)
+        {
             dounsubscribe();
-            ForEachQueue(qd) {
+            ForEachQueue(qd)
+            {
                 IPropertyTree *croot = queryClientRootSession(*qd);
-                croot->setPropInt64("@connected",croot->getPropInt64("@connected",0)-1);
+                unsigned connectedCount = croot->getPropInt64("@connected");
+                if (connectedCount) // should never be 0, but guard JIC
+                    connectedCount--;
+                if (connectedCount)
+                    croot->setPropInt64("@connected", connectedCount);
+                else
+                    qd->root->removeTree(croot);
             }
             connected = false;
         }

diff --git a/dali/base/dasds.cpp b/dali/base/dasds.cpp
@@ -4938,6 +4938,18 @@ void initializeInternals(IPropertyTree *root)
     root->addPropTree("Status/Servers",createPTree());
 }
 
+void clearStaleMeteData(IPropertyTree *root)
+{
+    // JobQueues
+    // Remove all Client entries from all queues. By definition they are stale (they should normally be removed when the client disconnects)
+    Owned<IPropertyTreeIterator> jobQueues = root->getElements("JobQueues/Queue");
+    ForEach(*jobQueues)
+    {
+        IPropertyTree &queue = jobQueues->query();
+        while (queue.removeProp("Client"));
+    }
+}
+
 IPropertyTree *loadStore(const char *storeFilename, unsigned edition, IPTreeMaker *iMaker, unsigned crcValidation, bool logErrorsOnly=false, const bool *abort=NULL)
 {
     CHECKEDCRITICALBLOCK(loadStoreCrit, fakeCritTimeout);
@@ -6543,6 +6555,7 @@ void CCovenSDSManager::loadStore(const char *storeName, const bool *abort)
     }
     Owned<IRemoteConnection> conn = connect("/", 0, RTM_INTERNAL, INFINITE);
     initializeInternals(conn->queryRoot());
+    clearStaleMeteData(conn->queryRoot());
     conn.clear();
     initializeStorageGroups(oldEnvironment);
 }