HPCC-14323 Bad type definition on processPerSlave

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>

dali/base/dadfs.cpp

@@ -9135,7 +9135,7 @@ class CInitGroups
         Owned<IGroup> grp;
         unsigned slavesPerNode = 0;
         if (grp_thor == groupType)
-            slavesPerNode = cluster.getPropInt("@slavesPerNode");
+            slavesPerNode = cluster.getPropInt("@slavesPerNode", 1);
         if (expand && slavesPerNode)
         {
             SocketEndpointArray msEps;

initfiles/componentfiles/configxml/thor.xsd.in

@@ -490,7 +490,7 @@
           </xs:appinfo>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute name="processPerSlave" type="xs:xs:boolean" use="optional" default="true">
+      <xs:attribute name="processPerSlave" type="xs:boolean" use="optional" default="true">
         <xs:annotation>
           <xs:appinfo>
             <tooltip>Makes each slave run in it's own process</tooltip>

initfiles/etc/DIR_NAME/environment.xml.in

@@ -1004,10 +1004,10 @@
                monitorDaliFileServer="true"
                name="mythor"
                pluginsPath="${PLUGINS_PATH}"
+               processPerSlave="true"
                replicateAsync="false"
                replicateOutputs="false"
                slavesPerNode="1"
-               processPerSlave="true"
                watchdogEnabled="true"
                watchdogProgressEnabled="true">
    <Debug/>

testing/regress/environment.xml.in

@@ -1004,6 +1004,7 @@
                monitorDaliFileServer="true"
                name="mythor"
                pluginsPath="${PLUGINS_PATH}"
+               processPerSlave="true"
                replicateAsync="false"
                replicateOutputs="false"
                slavesPerNode="1"
@@ -1031,6 +1032,7 @@
                monitorDaliFileServer="true"
                name="mythor3way"
                pluginsPath="${PLUGINS_PATH}"
+               processPerSlave="true"
                replicateAsync="false"
                replicateOutputs="false"
                slaveport="21100"

thorlcr/graph/thgraphmaster.cpp

@@ -2563,7 +2563,7 @@ void CMasterGraph::getFinalProgress()
         if (0 == msg.remaining())
             continue;
 
-        bool processPerSlave = globals->getPropBool("@processPerSlave");
+        bool processPerSlave = globals->getPropBool("@processPerSlave", true);
         unsigned slavesPerProcess = processPerSlave ? 1 : globals->getPropInt("@slavesPerNode", 1); // JCSMORE - should move somewhere common
         for (unsigned sc=0; sc<slavesPerProcess; sc++)
         {

thorlcr/master/thmastermain.cpp

@@ -569,7 +569,7 @@ int main( int argc, char *argv[]  )
             nodeGroup.append(thorname);
             globals->setProp("@nodeGroup", thorname);
         }
-        bool processPerSlave = globals->getPropBool("@processPerSlave");
+        bool processPerSlave = globals->getPropBool("@processPerSlave", true);
         Owned<IGroup> rawGroup = getClusterGroup(thorname, "ThorCluster", processPerSlave);
         unsigned slavesPerNode = globals->getPropInt("@slavesPerNode", 1);
         if (processPerSlave)

thorlcr/slave/slavmain.cpp

@@ -162,7 +162,7 @@ public:
     CJobListener() : excptHandler(*this)
     {
         stopped = true;
-        processPerSlave = globals->getPropBool("@processPerSlave");
+        processPerSlave = globals->getPropBool("@processPerSlave", true);
         slavesPerNode = globals->getPropInt("@slavesPerNode", 1);
         mpServers.append(* getMPServer());
         if (!processPerSlave)

thorlcr/slave/thslavemain.cpp

@@ -115,7 +115,7 @@ static bool RegisterSelf(SocketEndpoint &masterEp)
         globals = createPTree(msg);
         mergeCmdParams(globals); // cmd line
 
-        bool processPerSlave = globals->getPropBool("@processPerSlave");
+        bool processPerSlave = globals->getPropBool("@processPerSlave", true);
         unsigned slavesPerNode = globals->getPropInt("@slavesPerNode", 1);
         unsigned localThorPortInc = globals->getPropInt("@localThorPortInc", 200);
         unsigned basePort = getMachinePortBase();