Changes following review

Signed-off-by: Gavin Halliday <[email protected]>
hpcc-systems · Jan 10, 2025 · 6c067c2 · 6c067c2
1 parent 5240339
commit 6c067c2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/dali/base/dafdesc.cpp b/dali/base/dafdesc.cpp
@@ -3725,9 +3725,9 @@ static CriticalSection storageCS;
 static void doInitializeStorageGroups(bool createPlanesFromGroups, IPropertyTree * newGlobalConfiguration)
 {
     CriticalBlock block(storageCS);
-    Owned<IPropertyTree> storage = newGlobalConfiguration->getPropTree("storage");
+    IPropertyTree * storage = newGlobalConfiguration->queryPropTree("storage");
     if (!storage)
-        storage.set(newGlobalConfiguration->addPropTree("storage"));
+        storage = newGlobalConfiguration->addPropTree("storage");
 
     if (!isContainerized() && createPlanesFromGroups)
     {

diff --git a/system/jlib/jptree.cpp b/system/jlib/jptree.cpp
@@ -8735,7 +8735,7 @@ class CConfigUpdater : public CInterface
             args.append(arg);
         args.append(nullptr);
 
-        refreshConfiguration(true, false);
+        refreshConfiguration(true, true);
     }
     bool startMonitoring()
     {
@@ -8780,8 +8780,7 @@ class CConfigUpdater : public CInterface
     {
         CriticalBlock b(notifyFuncCS);
         //Ensure all modifications to the config take place before the config is updated, and the monitoring/caching functions are called.
-        for (auto & modifyFunc : modifyConfigUpdates)
-            modifyFunc.second(newComponentConfiguration, newGlobalConfiguration);
+        executeModifyCallbacks(newComponentConfiguration, newGlobalConfiguration);
 
         // NB: block calls to get*Config*() from other threads until callbacks notified and new swapped in, destroy old config outside the critical section
         Owned<IPropertyTree> oldComponentConfiguration;
@@ -8800,7 +8799,7 @@ class CConfigUpdater : public CInterface
 
             /* NB: we are still holding 'configCS' at this point, blocking all other thread access.
             However code in callbacks may call e.g. getComponentConfig() and re-enter the crit */
-            executeCallbacks(oldComponentConfiguration, oldGlobalConfiguration);
+            executeNotifyCallbacks(oldComponentConfiguration, oldGlobalConfiguration);
         }
     }
 
@@ -8837,14 +8836,14 @@ class CConfigUpdater : public CInterface
         }
     }
 
-    void executeCallbacks()
+    void executeNotifyCallbacks()
     {
         CriticalBlock notifyBlock(notifyFuncCS);
         CriticalBlock configBlock(configCS);
-        executeCallbacks(componentConfiguration, globalConfiguration);
+        executeNotifyCallbacks(componentConfiguration, globalConfiguration);
     }
 
-    void executeCallbacks(IPropertyTree *oldComponentConfiguration, IPropertyTree *oldGlobalConfiguration)
+    void executeNotifyCallbacks(IPropertyTree *oldComponentConfiguration, IPropertyTree *oldGlobalConfiguration)
     {
         for (const auto &item: notifyConfigUpdates)
         {
@@ -8859,6 +8858,23 @@ class CConfigUpdater : public CInterface
             }
         }
     }
+
+    void executeModifyCallbacks(IPropertyTree * newComponentConfiguration, IPropertyTree * newGlobalConfiguration)
+    {
+        for (auto & modifyFunc : modifyConfigUpdates)
+        {
+            try
+            {
+                modifyFunc.second(newComponentConfiguration, newGlobalConfiguration);
+            }
+            catch (IException *e)
+            {
+                EXCLOG(e, "CConfigUpdater callback");
+                e->Release();
+            }
+        }
+    }
+
     unsigned addNotifyFunc(ConfigUpdateFunc notifyFunc, bool callWhenInstalled)
     {
         CriticalBlock b(notifyFuncCS);