浏览代码

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 年之前
父节点
当前提交
43715ad0de
共有 1 个文件被更改,包括 3 次插入0 次删除
  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)){
       if((!strcmp(buildSetName,"roxie") && m_roxieNodes == 0 )|| (!strcmp(buildSetName,"thor")&& m_thorNodes == 0)){
           numOfNodesNeeded = 0;
           numOfNodesNeeded = 0;
           m_doNotGenComp.append(buildSetName);
           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))
       if(numOfNodesNeeded == 0 || (m_doNotGenComp.find(buildSetName) != NotFound))