Merge pull request #19234 from jackdelv/issue32724

HPCC-32724 Allow storage planes to be defined in bare-metal systems Reviewed-by: Jake Smith <jake.smith@lexisnexisrisk.com> Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com> Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
hpcc-systems · Dec 4, 2024 · a8b1971 · a8b1971
2 parents 5cca2b5 + a70dfcb
commit a8b1971
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 3 deletions.
diff --git a/dali/base/dafdesc.cpp b/dali/base/dafdesc.cpp
@@ -3570,6 +3570,11 @@ bool GroupInformation::checkIsSubset(const GroupInformation & other)
 
 void GroupInformation::createStoragePlane(IPropertyTree * storage, unsigned copy) const
 {
+    // Check that storage plane does not already have a definition
+    VStringBuffer xpath("planes[@name='%s']", name.str());
+    if (storage->hasProp(xpath))
+        return;
+
     IPropertyTree * plane = storage->addPropTree("planes");
     StringBuffer mirrorname;
     const char * planeName = name;
@@ -3611,6 +3616,8 @@ void GroupInformation::createStoragePlane(IPropertyTree * storage, unsigned copy
     const char * category = (dropZoneIndex != 0) ? "lz" : "data";
     plane->setProp("@category", category);
 
+    plane->setPropBool("@fromGroup", true);
+
     //MORE: If container is identical to this except for the name we could generate an information tag @alias
 }
 
@@ -3724,8 +3731,12 @@ static void doInitializeStorageGroups(bool createPlanesFromGroups)
         storage.set(globalConfig->addPropTree("storage"));
 
 #ifndef _CONTAINERIZED
-    if (createPlanesFromGroups && !storage->hasProp("planes"))
+    if (createPlanesFromGroups)
     {
+        // Remove old planes created from groups
+        while (storage->removeProp("planes[@fromGroup='1']"));
+        storage->removeProp("hostGroups"); // generateHosts will recreate host groups for all planes
+
         GroupInfoArray allGroups;
         unsigned numDropZones = 0;
 
@@ -3777,7 +3788,6 @@ static void doInitializeStorageGroups(bool createPlanesFromGroups)
     }
 #endif
 
-
     //Ensure that host groups that are defined in terms of other host groups are expanded out so they have an explicit list of hosts
     normalizeHostGroups();
 

diff --git a/initfiles/componentfiles/configxml/RoxieTopology.xsl b/initfiles/componentfiles/configxml/RoxieTopology.xsl
@@ -137,6 +137,7 @@
             <global>
                 <storage>
                     <xsl:copy-of select="/Environment/Software/RemoteStorage/*"/>
+                    <xsl:copy-of select="/Environment/Software/Globals/storage/*"/>
                 </storage>
                 <expert>
                     <xsl:copy-of select="/Environment/Software/Globals/@* | /Environment/Software/Globals/*"/>

diff --git a/initfiles/componentfiles/configxml/agentexec.xsl b/initfiles/componentfiles/configxml/agentexec.xsl
@@ -137,6 +137,7 @@
       <global>
         <storage>
           <xsl:copy-of select="/Environment/Software/RemoteStorage/*"/>
+          <xsl:copy-of select="/Environment/Software/Globals/storage/*"/>
         </storage>
         <expert>
           <xsl:copy-of select="/Environment/Software/Globals/@* | /Environment/Software/Globals/*"/>

diff --git a/initfiles/componentfiles/configxml/dali.xsl b/initfiles/componentfiles/configxml/dali.xsl
@@ -120,6 +120,7 @@
           <xsl:copy-of select="/Environment/Software/Globals/@* | /Environment/Software/Globals/*"/>
         </expert>
         <xsl:copy-of select="/Environment/Hardware/cost"/>
+        <xsl:copy-of select="/Environment/Software/Globals/storage"/>
       </global>
       <xsl:if test="@authMethod='secmgrPlugin'">
       <SecurityManagers>

diff --git a/initfiles/componentfiles/configxml/dfuserver.xsl b/initfiles/componentfiles/configxml/dfuserver.xsl
@@ -100,6 +100,7 @@
             <global>
               <storage>
                 <xsl:copy-of select="/Environment/Software/RemoteStorage/*"/>
+                <xsl:copy-of select="/Environment/Software/Globals/storage/*"/>
               </storage>
               <expert>
                 <xsl:copy-of select="/Environment/Software/Globals/@* | /Environment/Software/Globals/*"/>

diff --git a/initfiles/componentfiles/configxml/esp.xsl b/initfiles/componentfiles/configxml/esp.xsl
@@ -76,6 +76,7 @@
                 </expert>
                 <storage>
                     <xsl:copy-of select="/Environment/Software/RemoteStorage/*"/>
+                    <xsl:copy-of select="/Environment/Software/Globals/storage/*"/>
                 </storage>
                 <xsl:copy-of select="/Environment/Hardware/cost"/>
                 <xsl:copy-of select="/Environment/Software/tracing"/>

diff --git a/initfiles/componentfiles/configxml/thor.xsl b/initfiles/componentfiles/configxml/thor.xsl
@@ -205,7 +205,8 @@
       -->
       <global>
         <storage>
-          <xsl:copy-of select="/Environment/Software/RemoteStorage/*"/>  
+          <xsl:copy-of select="/Environment/Software/RemoteStorage/*"/>
+          <xsl:copy-of select="/Environment/Software/Globals/storage/*"/>
         </storage>
         <expert>
           <xsl:copy-of select="/Environment/Software/Globals/@* | /Environment/Software/Globals/*"/>