HPCC-15962 Envgen - add options to specify multiple esp instances

- Add flag -espnodes to specify number of esp nodes wizard should generate

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>

deployment/deployutils/wizardInputs.cpp

@@ -110,6 +110,11 @@ void CWizardInputs::setEnvironment()
   if(m_pXml->hasProp("@thorNodes"))
     m_thorNodes = atoi(m_pXml->queryProp("@thorNodes"));
 
+  m_espNodes = 1;
+  if(m_pXml->hasProp("@thorNodes"))
+    m_espNodes = atoi(m_pXml->queryProp("@espNodes"));
+
+
   if(m_pXml->hasProp("@dbuser"))
     m_dbuser = m_pXml->queryProp("@dbuser");
 
@@ -1231,6 +1236,8 @@ void CWizardInputs::addComponentToSoftware(IPropertyTree* pNewEnvTree, IProperty
           numOfIpNeeded = m_roxieNodes;
         else if (!strcmp(buildSetName, "thor"))
           numOfIpNeeded = m_thorNodes + 1;
+        else if (!strcmp(buildSetName, "esp"))
+            numOfIpNeeded = m_espNodes;
 
         CInstDetails* pInstDetail = getServerIPMap(sbNewName.str(), buildSetName, pNewEnvTree, numOfIpNeeded);
 
@@ -1250,7 +1257,14 @@ void CWizardInputs::addComponentToSoftware(IPropertyTree* pNewEnvTree, IProperty
             ForEachItemIn(x, ipArr)
             {
               assignedIP.clear().append(ipArr.item(x));
-              addInstanceToTree(pNewEnvTree, assignedIP, processName, buildSetName, "s1");
+              if (!strcmp(buildSetName, "esp"))
+              {
+                  StringBuffer s1("s_1");
+                  const char *pName = getUniqueName2(pNewEnvTree, s1, XML_TAG_ESPPROCESS, "");
+                  addInstanceToTree(pNewEnvTree, assignedIP, processName, buildSetName, pName);
+              }
+              else
+                addInstanceToTree(pNewEnvTree, assignedIP, processName, buildSetName, "s1");
             }
           }
         }

deployment/deployutils/wizardInputs.hpp

@@ -131,6 +131,7 @@ private:
    unsigned m_supportNodes;
    unsigned m_roxieNodes;
    unsigned m_thorNodes;
+   unsigned m_espNodes;
    unsigned m_thorSlavesPerNode;
    unsigned m_roxieAgentRedChannels;
    unsigned m_roxieAgentRedOffset;

deployment/envgen/main.cpp

@@ -83,6 +83,11 @@ void usage()
   puts("          for thor slaves. A node for thor master is automatically added. ");
   puts("          If not specified or specified as 0, no thor nodes");
   puts("          are generated");
+  puts("   -espnodes <number of esp nodes>: Number of nodes to be generated  ");
+  puts("          If not specified 1 esp node is generated");
+  puts("          If 0 is specified then all available nodes specified with assign_ips flag ");
+  puts("          will be used, others 0 esp nodes will be generated.");
+  puts("          If greater than 1 instance is specified, -assign_ips for esp is required to be set.");
   puts("   -slavesPerNode <number of thor slaves per node>: Number of thor nodes ");
   puts("          per slave.");
   puts("   -roxieondemand <enable roxie on demand(1) or disable roxie on demand(any ");
@@ -116,7 +121,7 @@ int main(int argc, char** argv)
   const char* out_envname = NULL;
   const char* in_ipfilename;
   StringBuffer ipAddrs;
-  int roxieNodes=0, thorNodes=0, slavesPerNode=1, supportNodes=0;
+  int roxieNodes=0, thorNodes=0, slavesPerNode=1, supportNodes=0, espNodes=1;
   bool roxieOnDemand = true;
   MapStringTo<StringBuffer> dirMap;
   StringArray overrides;
@@ -180,6 +185,16 @@ int main(int argc, char** argv)
         return 1;
       }
     }
+    else if (stricmp(argv[i], "-espnodes") == 0)
+    {
+      i++;
+
+      if (validateInteger(argv[i++],espNodes) != true)
+      {
+        releaseAtoms();
+        return 1;
+      }
+    }
     else if (stricmp(argv[i], "-slavespernode") == 0)
     {
       i++;
@@ -283,8 +298,8 @@ int main(int argc, char** argv)
     const char* pServiceName = "WsDeploy_wsdeploy_esp";
     Owned<IPropertyTree> pCfg = createPTreeFromXMLFile(ENVGEN_PATH_TO_ESP_CONFIG);
 
-    optionsXml.appendf("<XmlArgs supportNodes=\"%d\" roxieNodes=\"%d\" thorNodes=\"%d\" slavesPerNode=\"%d\" roxieOnDemand=\"%s\" ipList=\"%s\"/>", supportNodes, roxieNodes,
-      thorNodes, slavesPerNode, roxieOnDemand?"true":"false", ipAddrs.str());
+    optionsXml.appendf("<XmlArgs supportNodes=\"%d\" roxieNodes=\"%d\" thorNodes=\"%d\" espNodes=\"%d\" slavesPerNode=\"%d\" roxieOnDemand=\"%s\" ipList=\"%s\"/>", supportNodes, roxieNodes,
+      thorNodes, espNodes, slavesPerNode, roxieOnDemand?"true":"false", ipAddrs.str());
 
     buildEnvFromWizard(optionsXml, pServiceName, pCfg, envXml, arrBuildSetWithAssignedIPs, arrAssignIPRanges, &dirMap);