From 57e3e86cda8d1c8c2890cb37773abf0f0f65665a Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 10 Apr 2008 09:15:08 +0000 Subject: [PATCH] Use the proper exit code for mpirun to indicate an error when something goes wrong during launch (in scenarios where the procs don't report the problem directly themselves) This commit was SVN r18121. --- orte/mca/plm/alps/plm_alps_module.c | 2 +- orte/mca/plm/ccp/plm_ccp_module.c | 2 +- orte/mca/plm/gridengine/plm_gridengine_module.c | 2 +- orte/mca/plm/lsf/plm_lsf_module.c | 2 +- orte/mca/plm/process/plm_process_module.c | 2 +- orte/mca/plm/rsh/plm_rsh_module.c | 2 +- orte/mca/plm/slurm/plm_slurm_module.c | 2 +- orte/mca/plm/tm/plm_tm_module.c | 2 +- orte/mca/plm/xgrid/src/plm_xgrid_module.m | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/orte/mca/plm/alps/plm_alps_module.c b/orte/mca/plm/alps/plm_alps_module.c index 51fa2d95a1..6ecd0bc12e 100644 --- a/orte/mca/plm/alps/plm_alps_module.c +++ b/orte/mca/plm/alps/plm_alps_module.c @@ -398,7 +398,7 @@ cleanup: /* check for failed launch - if so, force terminate */ if (failed_launch) { - orte_plm_base_launch_failed(jdata->jobid, false, -1, 0, ORTE_JOB_STATE_FAILED_TO_START); + orte_plm_base_launch_failed(jdata->jobid, false, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); } return rc; diff --git a/orte/mca/plm/ccp/plm_ccp_module.c b/orte/mca/plm/ccp/plm_ccp_module.c index 73f7b4a3cc..c5c25e4d67 100644 --- a/orte/mca/plm/ccp/plm_ccp_module.c +++ b/orte/mca/plm/ccp/plm_ccp_module.c @@ -561,7 +561,7 @@ launch_apps: /* check for failed launch - if so, force terminate */ if (failed_launch) { - orte_plm_base_launch_failed(jdata->jobid, false, -1, 0, ORTE_JOB_STATE_FAILED_TO_START); + orte_plm_base_launch_failed(jdata->jobid, false, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); } /* check for timing request - get stop time and process if so */ diff --git a/orte/mca/plm/gridengine/plm_gridengine_module.c b/orte/mca/plm/gridengine/plm_gridengine_module.c index 4b605a7a77..ce50a074d9 100644 --- a/orte/mca/plm/gridengine/plm_gridengine_module.c +++ b/orte/mca/plm/gridengine/plm_gridengine_module.c @@ -566,7 +566,7 @@ cleanup: /* check for failed launch - if so, force terminate */ if (failed_launch) { - orte_plm_base_launch_failed(jdata->jobid, false, -1, 0, ORTE_JOB_STATE_FAILED_TO_START); + orte_plm_base_launch_failed(jdata->jobid, false, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); } return rc; diff --git a/orte/mca/plm/lsf/plm_lsf_module.c b/orte/mca/plm/lsf/plm_lsf_module.c index 0434c107f6..c6e92c0c3b 100644 --- a/orte/mca/plm/lsf/plm_lsf_module.c +++ b/orte/mca/plm/lsf/plm_lsf_module.c @@ -347,7 +347,7 @@ cleanup: /* check for failed launch - if so, force terminate */ if (failed_launch) { if (ORTE_SUCCESS != - orte_plm_base_launch_failed(jdata->jobid, false, -1, 0, ORTE_JOB_STATE_FAILED_TO_START); + orte_plm_base_launch_failed(jdata->jobid, false, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); } return rc; diff --git a/orte/mca/plm/process/plm_process_module.c b/orte/mca/plm/process/plm_process_module.c index d62d4e41d6..29e08119ff 100644 --- a/orte/mca/plm/process/plm_process_module.c +++ b/orte/mca/plm/process/plm_process_module.c @@ -861,7 +861,7 @@ launch_apps: /* check for failed launch - if so, force terminate */ if( failed_launch ) { - orte_plm_base_launch_failed(jdata->jobid, false, -1, 0, ORTE_JOB_STATE_FAILED_TO_START); + orte_plm_base_launch_failed(jdata->jobid, false, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); } return rc; diff --git a/orte/mca/plm/rsh/plm_rsh_module.c b/orte/mca/plm/rsh/plm_rsh_module.c index b0ba2ba9ba..3d50b34aa7 100644 --- a/orte/mca/plm/rsh/plm_rsh_module.c +++ b/orte/mca/plm/rsh/plm_rsh_module.c @@ -810,7 +810,7 @@ launch_apps: /* check for failed launch - if so, force terminate */ if (failed_launch) { - orte_plm_base_launch_failed(jdata->jobid, false, -1, 0, ORTE_JOB_STATE_FAILED_TO_START); + orte_plm_base_launch_failed(jdata->jobid, false, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); } return rc; diff --git a/orte/mca/plm/slurm/plm_slurm_module.c b/orte/mca/plm/slurm/plm_slurm_module.c index 9d13e5d17d..42bb3ee01f 100644 --- a/orte/mca/plm/slurm/plm_slurm_module.c +++ b/orte/mca/plm/slurm/plm_slurm_module.c @@ -400,7 +400,7 @@ cleanup: /* check for failed launch - if so, force terminate */ if (failed_launch) { - orte_plm_base_launch_failed(jdata->jobid, false, -1, 0, ORTE_JOB_STATE_FAILED_TO_START); + orte_plm_base_launch_failed(jdata->jobid, false, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); } return rc; diff --git a/orte/mca/plm/tm/plm_tm_module.c b/orte/mca/plm/tm/plm_tm_module.c index 3c5c83e4af..98ec9f79ad 100644 --- a/orte/mca/plm/tm/plm_tm_module.c +++ b/orte/mca/plm/tm/plm_tm_module.c @@ -445,7 +445,7 @@ launch_apps: /* check for failed launch - if so, force terminate */ if (failed_launch) { - orte_plm_base_launch_failed(jdata->jobid, true, -1, 0, ORTE_JOB_STATE_FAILED_TO_START); + orte_plm_base_launch_failed(jdata->jobid, true, -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); } /* check for timing request - get stop time and process if so */ diff --git a/orte/mca/plm/xgrid/src/plm_xgrid_module.m b/orte/mca/plm/xgrid/src/plm_xgrid_module.m index 43b66f12fe..f269ccd2db 100644 --- a/orte/mca/plm/xgrid/src/plm_xgrid_module.m +++ b/orte/mca/plm/xgrid/src/plm_xgrid_module.m @@ -203,7 +203,7 @@ orte_plm_xgrid_spawn(orte_job_t *jdata) if (failed_launch) { orte_plm_base_launch_failed(jdata->jobid, false, - -1, 0, + -1, ORTE_ERROR_DEFAULT_EXIT_CODE, ORTE_JOB_STATE_FAILED_TO_START); }