Merge pull request #1899 from rhc54/topic/nodeid

Pass the nodeid for each proc in the job. Fix a mistaken error output message

ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c

@@ -198,7 +198,7 @@ int mca_topo_treematch_dist_graph_create(mca_topo_base_module_t* topo_module,
         OPAL_MODEX_RECV_VALUE(err, OPAL_PMIX_NODEID, &(proc->super.proc_name), &pval, OPAL_UINT32);
         if( OPAL_SUCCESS != err ) {
             opal_output(0, "Unable to extract peer %s nodeid from the modex.\n",
-                        OMPI_NAME_PRINT(&(proc->super)));
+                        OMPI_NAME_PRINT(&(proc->super.proc_name)));
             vpids[i] = colors[i] = -1;
             continue;
         }

orte/orted/pmix/pmix_server_register_fns.c

@@ -374,12 +374,19 @@ int orte_pmix_server_register_nspace(orte_job_t *jdata)
         kv->data.uint32 = pptr->node_rank;
         opal_list_append(pmap, &kv->super);
 
-        /* node id */
+        /* hostname */
         kv = OBJ_NEW(opal_value_t);
         kv->key = strdup(OPAL_PMIX_HOSTNAME);
         kv->type = OPAL_STRING;
         kv->data.string = strdup(pptr->node->name);
         opal_list_append(pmap, &kv->super);
+
+        /* node ID */
+        kv = OBJ_NEW(opal_value_t);
+        kv->key = strdup(OPAL_PMIX_NODEID);
+        kv->type = OPAL_UINT32;
+        kv->data.uint32 = node->index;
+        opal_list_append(pmap, &kv->super);
     }
 
     /* mark the job as registered */