Merge pull request #2776 from rhc54/topic/fix

Add missing flag set to ensure nodes do not get double-added to job map.

Author: Ralph Castain

orte/mca/grpcomm/base/grpcomm_base_stubs.c

@@ -401,10 +401,10 @@ static int create_dmns(orte_grpcomm_signature_t *sig,
                 *dmns = NULL;
                 return ORTE_ERR_NOT_FOUND;
             }
-            opal_output_verbose(5, orte_grpcomm_base_framework.framework_output,
+            OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output,
                                 "%s sign: GETTING PROC OBJECT FOR %s",
                                 ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
-                                ORTE_NAME_PRINT(&sig->signature[n]));
+                                ORTE_NAME_PRINT(&sig->signature[n])));
             if (NULL == (proc = (orte_proc_t*)opal_pointer_array_get_item(jdata->procs, sig->signature[n].vpid))) {
                 ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
                 OPAL_LIST_DESTRUCT(&ds);

orte/mca/odls/base/odls_base_default_fns.c

@@ -462,6 +462,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer,
         /* add the node to the map, if not already there */
         if (!ORTE_FLAG_TEST(dmn->node, ORTE_NODE_FLAG_MAPPED)) {
             OBJ_RETAIN(dmn->node);
+            ORTE_FLAG_SET(dmn->node, ORTE_NODE_FLAG_MAPPED);
             opal_pointer_array_add(jdata->map->nodes, dmn->node);
             if (newmap) {
                 jdata->map->num_nodes++;