From 43d1cd92ac69ad2ceed8ddf52d1f2decc59c6a53 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 29 Aug 2013 22:50:51 +0000 Subject: [PATCH] Ensure we activate the "daemons launched" state when only the HNP is left or else we will hang. cmr:v1.7.3:reviewer=jsquyres This commit was SVN r29094. --- orte/mca/plm/slurm/plm_slurm_module.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/orte/mca/plm/slurm/plm_slurm_module.c b/orte/mca/plm/slurm/plm_slurm_module.c index 44f0a5a18b..5d23ff6e62 100644 --- a/orte/mca/plm/slurm/plm_slurm_module.c +++ b/orte/mca/plm/slurm/plm_slurm_module.c @@ -242,9 +242,7 @@ static void launch_daemons(int fd, short args, void *cbdata) "%s plm:slurm: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); state->jdata->state = ORTE_JOB_STATE_DAEMONS_LAUNCHED; - if (ORTE_JOB_STATE_DAEMONS_REPORTED == daemons->state) { - ORTE_ACTIVATE_JOB_STATE(state->jdata, ORTE_JOB_STATE_DAEMONS_REPORTED); - } + ORTE_ACTIVATE_JOB_STATE(state->jdata, ORTE_JOB_STATE_DAEMONS_REPORTED); OBJ_RELEASE(state); return; }