Ensure we properly exit with error if we cannot map the job

Ralph Castain · Ralph Castain · commit f8e1e3bed386 · 2017-03-21T15:15:32.000-07:00
Signed-off-by: Ralph Castain &lt;rhc@open-mpi.org&gt;
diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c
@@ -422,7 +422,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,
         /* create the map - will already have been done for the novm case */
         if (ORTE_SUCCESS != (rc = orte_rmaps_base_map_job(jdata))) {
             ORTE_ERROR_LOG(rc);
-            return rc;
+            goto REPORT_ERROR;
         }
         /* find our local procs */
         for (n=0; n < jdata->map->nodes->size; n++) {
@@ -457,7 +457,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,
         /* compute and save bindings of local children */
         if (ORTE_SUCCESS != (rc = orte_rmaps_base_compute_bindings(jdata))) {
             ORTE_ERROR_LOG(rc);
-            return rc;
+            goto REPORT_ERROR;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -422,7 +422,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,`
`422`	`422`	`/* create the map - will already have been done for the novm case */`
`423`	`423`	`if (ORTE_SUCCESS != (rc = orte_rmaps_base_map_job(jdata))) {`
`424`	`424`	`ORTE_ERROR_LOG(rc);`
`425`		`- return rc;`
	`425`	`+ goto REPORT_ERROR;`
`426`	`426`	`}`
`427`	`427`	`/* find our local procs */`
`428`	`428`	`for (n=0; n < jdata->map->nodes->size; n++) {`
`@@ -457,7 +457,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,`
`457`	`457`	`/* compute and save bindings of local children */`
`458`	`458`	`if (ORTE_SUCCESS != (rc = orte_rmaps_base_compute_bindings(jdata))) {`
`459`	`459`	`ORTE_ERROR_LOG(rc);`
`460`		`- return rc;`
	`460`	`+ goto REPORT_ERROR;`
`461`	`461`	`}`
`462`	`462`	`}`
`463`	`463`