Ver código fonte

Merge pull request #12035 from wangkx/h21261

HPCC-21261 Read @thorname as cluster name for running WUs on thor

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 6 anos atrás
pai
commit
145ccebea1
1 arquivos alterados com 3 adições e 1 exclusões
  1. 3 1
      esp/services/ws_smc/ws_smcService.cpp

+ 3 - 1
esp/services/ws_smc/ws_smcService.cpp

@@ -439,7 +439,9 @@ void CActivityInfo::readRunningWUsOnStatusServer(IEspContext& context, IProperty
         IPropertyTree& serverStatusNode = itrStatusServer->query();
 
         StringBuffer serverInstance;
-        if ((statusServerType == WsSMCSSTThorLCRCluster) || (statusServerType == WsSMCSSTRoxieCluster))
+        if (statusServerType == WsSMCSSTThorLCRCluster)
+            serverStatusNode.getProp("@thorname", serverInstance);
+        else if (statusServerType == WsSMCSSTRoxieCluster)
             serverStatusNode.getProp("@cluster", serverInstance);
         else
             serverInstance.appendf("%s on %s", serverName, serverStatusNode.queryProp("@node"));