Merge pull request #1768 from wangkx/gh1642d

Preflight should use new pid file name for multiSlaves

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/services/ws_machine/ws_machineService.cpp

@@ -2490,16 +2490,8 @@ void Cws_machineEx::getTargetClusterProcesses(StringArray& targetClusters, Strin
                                 dirStr.append(pClusterProcess->queryProp("@directory"));
 
                             getMachineList(constEnv, pClusterProcess, process, eqThorMasterProcess, dirStr.str(), processAddresses);
-                            if (pClusterProcess->getPropBool("@multiSlaves"))
-                            {
-                                getMachineList(constEnv, pClusterProcess, process, eqThorSlaveProcess, dirStr.str(), processAddresses);
-                                getMachineList(constEnv, pClusterProcess, process, eqThorSpareProcess, dirStr.str(), processAddresses);
-                            }
-                            else
-                            {
-                                getThorMachineList(constEnv, pClusterProcess, process, eqThorSlaveProcess, dirStr.str(), processAddresses);
-                                getThorMachineList(constEnv, pClusterProcess, process, eqThorSpareProcess, dirStr.str(), processAddresses);
-                            }
+                            getThorMachineList(constEnv, pClusterProcess, process, eqThorSlaveProcess, dirStr.str(), processAddresses);
+                            getThorMachineList(constEnv, pClusterProcess, process, eqThorSpareProcess, dirStr.str(), processAddresses);
                         }
                     }
                 }

esp/smc/SMCLib/TpWrapper.cpp

@@ -1554,12 +1554,8 @@ void CTpWrapper::getMachineList(double clientVersion,
         if (!cluster)
             throw MakeStringExceptionDirect(ECLWATCH_CANNOT_GET_ENV_INFO, MSG_FAILED_GET_ENVIRONMENT_INFO);
 
+        //set this flag for legacy multi slave clusters because SwapNode made little sense in the old scheme
         multiSlaves = cluster->getPropBool("@multiSlaves");
-        if (multiSlaves)
-        {   //multiSlaves will be set to true for legacy multiSlaves environment
-            getMachineList(MachineType, ParentPath, Status, Directory, MachineList);
-            return;
-        }
 
         StringBuffer groupName;
         if (strieq(MachineType, eqThorSlaveProcess))