From c199dbb24115a1f0b6debc6da742c42f1b8a3099 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 20 Jun 2009 03:58:00 +0000 Subject: [PATCH] Revert r21480 - we already did open/select the PLM on non-HNP daemons. This commit broke slave launches on Torque and SLURM as it caused the PLM to be open/selected twice. The open/select of the PLM is done in orte/mca/ess/base/ess_base_std_orted.c. It only is done when the PLM MCA param is set directing a specific PLM be selected. The function orte_plm_base_orted_append_basic_args clears the params passed to the daemon of any PLM selection passed to the HNP. Each PLM then adds a PLM directive if-and-only-if backend PLM support is desired. At present, Torque, SLURM, and rsh all specify this support and direct that the backend orted open the "rsh" PLM. This commit was SVN r21488. The following SVN revision numbers were found above: r21480 --> open-mpi/ompi@ed585bce8aacdee550934004a972af549191d73a --- orte/mca/ess/env/ess_env_module.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/orte/mca/ess/env/ess_env_module.c b/orte/mca/ess/env/ess_env_module.c index 1a2b8aac1a..bc7822fe78 100644 --- a/orte/mca/ess/env/ess_env_module.c +++ b/orte/mca/ess/env/ess_env_module.c @@ -150,20 +150,6 @@ static int rte_init(void) goto error; } opal_argv_free(hosts); - - /* in case we are asked to spawn remote daemons... */ - if (ORTE_SUCCESS != (ret = orte_plm_base_open())) { - ORTE_ERROR_LOG(ret); - error = "orte_plm_base_open"; - goto error; - } - - if (ORTE_SUCCESS != (ret = orte_plm_base_select())) { - ORTE_ERROR_LOG(ret); - error = "orte_plm_base_select"; - goto error; - } - return ORTE_SUCCESS; }