Merge pull request #11213 from kenrowland/HPCC-8396

HPCC-8396 Change default value for localThorPortInc

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

initfiles/componentfiles/configxml/setvars_linux.xsl

@@ -58,7 +58,7 @@ export THORSLAVEPORT=<xsl:call-template name="setOrDefault">
                      </xsl:call-template>
 export localthorportinc=<xsl:call-template name="setOrDefault">
                             <xsl:with-param name="attribute" select="@localThorPortInc"/>
-                            <xsl:with-param name="default" select="'200'"/>
+                            <xsl:with-param name="default" select="'20'"/>
                         </xsl:call-template>
 export slavespernode=<xsl:call-template name="setOrDefault">
                         <xsl:with-param name="attribute" select="@slavesPerNode"/>

initfiles/componentfiles/configxml/thor.xsd.in

@@ -477,7 +477,7 @@
           </xs:appinfo>
         </xs:annotation>
       </xs:attribute>
-      <xs:attribute name="localThorPortInc" type="xs:nonNegativeInteger" default="200">
+      <xs:attribute name="localThorPortInc" type="xs:nonNegativeInteger" default="20">
         <xs:annotation>
           <xs:appinfo>
             <tooltip>Port increment between slaves on same node</tooltip>

initfiles/etc/DIR_NAME/environment.xml.in

@@ -814,7 +814,7 @@
                heapUseHugePages="false"
                heapUseTransparentHugePages="true"
                localThor="true"
-               localThorPortInc="200"
+               localThorPortInc="20"
                masterport="20000"
                monitorDaliFileServer="true"
                name="mythor"

testing/regress/environment.xml.in

@@ -713,7 +713,7 @@
                heapUseHugePages="false"
                heapUseTransparentHugePages="true"
                localThor="true"
-               localThorPortInc="200"
+               localThorPortInc="20"
                masterport="20000"
                monitorDaliFileServer="true"
                name="mythor"

thorlcr/slave/slavmain.cpp

@@ -1582,7 +1582,7 @@ public:
     {
         stopped = true;
         channelsPerSlave = globals->getPropInt("@channelsPerSlave", 1);
-        unsigned localThorPortInc = globals->getPropInt("@localThorPortInc", 200);
+        unsigned localThorPortInc = globals->getPropInt("@localThorPortInc", DEFAULT_SLAVEPORTINC);
         mpServers.append(* getMPServer());
         bool reconnect = globals->getPropBool("@MPChannelReconnect");
         for (unsigned sc=1; sc<channelsPerSlave; sc++)

thorlcr/thorutil/thormisc.hpp

@@ -312,7 +312,7 @@ public:
 
 #define DEFAULT_THORMASTERPORT 20000
 #define DEFAULT_THORSLAVEPORT 20100
-#define DEFAULT_SLAVEPORTINC 200
+#define DEFAULT_SLAVEPORTINC 20
 #define DEFAULT_QUERYSO_LIMIT 10
 
 class graph_decl CFifoFileCache : public CSimpleInterface