Ensure that we only launch procs on the HNP if that node is actually included in the allocation.

This commit was SVN r19038.

orte/mca/ras/base/ras_base_node.c

@@ -103,6 +103,8 @@ int orte_ras_base_node_insert(opal_list_t* nodes, orte_job_t *jdata)
                                  ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
                                  (long)node->slots));
             
+            /* flag that hnp has been allocated */
+            orte_hnp_is_allocated = true;
             /* adjust the total slots in the job */
             jdata->total_slots_alloc -= hnp_node->slots;
             /* copy the allocation data to that node's info */

orte/mca/rmaps/base/rmaps_base_support_fns.c

@@ -56,7 +56,14 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr
     
     /* create a working list of nodes */
     nodes = (orte_node_t**)orte_node_pool->addr;
-    for (i=0; i < orte_node_pool->size; i++) {
+    
+    /* if the hnp was allocated, include it */
+    if (orte_hnp_is_allocated) {
+        OBJ_RETAIN(nodes[0]);
+        opal_list_append(allocated_nodes, &nodes[0]->super);
+    }
+    
+    for (i=1; i < orte_node_pool->size; i++) {
         if (NULL == nodes[i]) {
             break;  /* nodes are left aligned, so stop when we hit a null */
         } 
@@ -133,20 +140,19 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr
      * from the list
      */
     if (policy & ORTE_RMAPS_NO_USE_LOCAL) {
-        for (item  = opal_list_get_first(allocated_nodes);
-             item != opal_list_get_end(allocated_nodes);
-             item  = opal_list_get_next(item) ) {
-            node = (orte_node_t*)item;
-            /* need to check ifislocal because the name in the
-             * hostfile may not have been FQDN, while name returned
-             * by gethostname may have been (or vice versa)
-             */
-            if (0 == strcmp(node->name, orte_process_info.nodename) ||
-                opal_ifislocal(node->name)) {
-                opal_list_remove_item(allocated_nodes, item);
-                OBJ_RELEASE(item);  /* "un-retain" it */
-                break;
-            }
+        /* we don't need to check through the entire list as
+         * the head node - if it is on the list at all - will
+         * always be in the first position
+         */
+        node = (orte_node_t*)opal_list_get_first(allocated_nodes);
+        /* need to check ifislocal because the name in the
+         * hostfile may not have been FQDN, while name returned
+         * by gethostname may have been (or vice versa)
+         */
+        if (0 == strcmp(node->name, orte_process_info.nodename) ||
+            opal_ifislocal(node->name)) {
+            opal_list_remove_item(allocated_nodes, item);
+            OBJ_RELEASE(item);  /* "un-retain" it */
         }
         /** check that anything is left! */
         if (0 == opal_list_get_size(allocated_nodes)) {
@@ -156,7 +162,6 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr
         }
     }
 
-        
     /* remove all nodes that are already at max usage, and
      * compute the total number of available slots while
      * we do so

orte/runtime/orte_globals.c

@@ -62,6 +62,9 @@ int32_t orte_contiguous_nodes;
 int orte_debug_output = -1;
 char **orte_launch_environ;
 opal_pointer_array_t orte_daemonmap;
+
+bool orte_hnp_is_allocated = false;
+
 char **orted_cmd_line=NULL;
 int orte_exit, orteds_exit;
 int orte_exit_status = 0;

orte/runtime/orte_globals.h

@@ -348,6 +348,8 @@ ORTE_DECLSPEC extern bool orte_hetero_apps;
 ORTE_DECLSPEC extern char **orte_launch_environ;
 ORTE_DECLSPEC extern opal_pointer_array_t orte_daemonmap;
 
+ORTE_DECLSPEC extern bool orte_hnp_is_allocated;
+
 ORTE_DECLSPEC extern char **orted_cmd_line;
 ORTE_DECLSPEC extern int orte_exit, orteds_exit;
 ORTE_DECLSPEC extern int orte_exit_status;