Bläddra i källkod

HPCC-14956 ConfigMgr crashes when using wizard

    - The wizard uses the clusters defined in genenvrules.conf to
      create the default clusters.  When roxie or thor is not in the
      generated environment, clusters containing those components should
      be skipped.

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Gleb Aronsky 9 år sedan
förälder
incheckning
43715ad0de
1 ändrade filer med 3 tillägg och 0 borttagningar
  1. 3 0
      deployment/deployutils/wizardInputs.cpp

+ 3 - 0
deployment/deployutils/wizardInputs.cpp

@@ -1092,6 +1092,9 @@ void CWizardInputs::checkForDependencies()
       if((!strcmp(buildSetName,"roxie") && m_roxieNodes == 0 )|| (!strcmp(buildSetName,"thor")&& m_thorNodes == 0)){
           numOfNodesNeeded = 0;
           m_doNotGenComp.append(buildSetName);
+          m_compForTopology.remove("thor_roxie");
+          if (!strcmp(buildSetName,"thor"))
+             m_compForTopology.remove("thor");
       }
 
       if(numOfNodesNeeded == 0 || (m_doNotGenComp.find(buildSetName) != NotFound))