Przeglądaj źródła

HPCC-15636 envgen - set thor master option

- set_ips thor <IPs> will use first IP as thor master

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Gleb Aronsky 8 lat temu
rodzic
commit
595ab473d9
1 zmienionych plików z 7 dodań i 3 usunięć
  1. 7 3
      deployment/deployutils/wizardInputs.cpp

+ 7 - 3
deployment/deployutils/wizardInputs.cpp

@@ -290,6 +290,7 @@ CInstDetails* CWizardInputs::getServerIPMap(const char* compName, const char* bu
     else
     {
       unsigned x = 0;
+      unsigned origNumOfNodes(numOfNodes);
 
       for(; x < numOfNodes ; x++)
       {
@@ -337,9 +338,12 @@ CInstDetails* CWizardInputs::getServerIPMap(const char* compName, const char* bu
           else if (!strcmp(buildSetName, "roxie"))
             sb.clear().append("non-support ");
 
-          throw MakeStringException(-1, \
-            "Total nodes: %d (%d Support Nodes + %d Non-support Nodes)\nError: Cannot assign %d number of nodes for %s due to insufficient %s nodes available. Please enter different values", \
-            ips + ipns, ips, ipns, numOfNodes, sbBuildSet.str(), sb.str());
+          if (m_arrBuildSetsWithAssignedIPs.find(buildSetName) == NotFound)
+             throw MakeStringException(-1, \
+                "Total nodes: %d (%d Support Nodes + %d Non-support Nodes)\nError: Cannot assign %d number of nodes for %s due to insufficient %s nodes available. Please enter different values", \
+                ips + ipns, ips, ipns, numOfNodes, sbBuildSet.str(), sb.str());
+          else
+              throw MakeStringException(-1, "Total nodes required: %d\nError: Unable to assign %d nodes, no more assigned ip nodes available for %s", origNumOfNodes, origNumOfNodes - getCntForAlreadyAssignedIPS(buildSetName), buildSetName);
         }
         else{
           return m_compIpMap.getValue(buildSetName);