Merge pull request #1354 from jjhursey/topic/mixed-hostname

jsquyres · web-flow · commit 5aabc18baed4 · 2016-09-12T13:18:58.000-05:00
orte: Expand the application of !orte_keep_fqdn_hostnames
diff --git a/orte/mca/plm/base/plm_base_launch_support.c b/orte/mca/plm/base/plm_base_launch_support.c
@@ -16,6 +16,7 @@
  * Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2015 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -1491,7 +1492,7 @@ int orte_plm_base_setup_virtual_machine(orte_job_t *jdata)
     bool one_filter = false;
     int num_nodes;
     bool default_hostfile_used;
-    char *hosts;
+    char *hosts = NULL;
     bool singleton=false;
 
     OPAL_OUTPUT_VERBOSE((5, orte_plm_base_framework.framework_output,
diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c
@@ -13,6 +13,7 @@
  * Copyright (c) 2011-2012 Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014      Intel, Inc. All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -147,7 +148,7 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr
     orte_job_t *daemons;
     bool novm;
     opal_list_t nodes;
-    char *hosts;
+    char *hosts = NULL;
 
     /** set default answer */
     *total_num_slots = 0;
diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file.c b/orte/mca/rmaps/rank_file/rmaps_rank_file.c
@@ -17,6 +17,7 @@
  * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -37,6 +38,7 @@
 
 #include "opal/util/argv.h"
 #include "opal/util/if.h"
+#include "opal/util/net.h"
 #include "opal/class/opal_pointer_array.h"
 #include "opal/mca/hwloc/base/base.h"
 
@@ -489,6 +491,15 @@ static int orte_rmaps_rank_file_parse(const char *rankfile)
                             goto unlock;
                         }
                         opal_argv_free (argv);
+
+                        // Strip off the FQDN if present, ignore IP addresses
+                        if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(node_name) ) {
+                            char *ptr;
+                            if (NULL != (ptr = strchr(node_name, '.'))) {
+                                *ptr = '\0';
+                            }
+                        }
+
                         /* check the rank item */
                         if (NULL == rfmap) {
                             orte_show_help("help-rmaps_rank_file.txt", "bad-syntax", true, rankfile);
diff --git a/orte/mca/rmaps/seq/rmaps_seq.c b/orte/mca/rmaps/seq/rmaps_seq.c
@@ -15,6 +15,7 @@
  * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -34,6 +35,7 @@
 #include <ctype.h>
 
 #include "opal/util/if.h"
+#include "opal/util/net.h"
 #include "opal/mca/hwloc/hwloc.h"
 
 #include "orte/util/show_help.h"
@@ -70,9 +72,11 @@ static void sn_des(seq_node_t *p)
 {
     if (NULL != p->hostname) {
         free(p->hostname);
+        p->hostname = NULL;
     }
     if (NULL != p->cpuset) {
         free(p->cpuset);
+        p->cpuset = NULL;
     }
 }
 OBJ_CLASS_INSTANCE(seq_node_t,
@@ -101,7 +105,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
     opal_list_t node_list, *seq_list, sq_list;
     orte_proc_t *proc;
     mca_base_component_t *c = &mca_rmaps_seq_component.base_version;
-    char *hosts, *sep, *eptr;
+    char *hosts = NULL, *sep, *eptr;
     FILE *fp;
     opal_hwloc_resource_type_t rtype;
 
@@ -156,7 +160,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
     /* if there is a default hostfile, go and get its ordered list of nodes */
     OBJ_CONSTRUCT(&default_seq_list, opal_list_t);
     if (NULL != orte_default_hostfile) {
-        char *hstname;
+        char *hstname = NULL;
         /* open the file */
         fp = fopen(orte_default_hostfile, "r");
         if (NULL == fp) {
@@ -170,6 +174,11 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
                 /* blank line - ignore */
                 continue;
             }
+            if( '#' == hstname[0] ) {
+                free(hstname);
+                /* Comment line - ignore */
+                continue;
+            }
             sq = OBJ_NEW(seq_node_t);
             if (NULL != (sep = strchr(hstname, ' '))) {
                 *sep = '\0';
@@ -182,6 +191,15 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
                 *(eptr+1) = 0;
                 sq->cpuset = strdup(sep);
             }
+
+            // Strip off the FQDN if present, ignore IP addresses
+            if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(hstname) ) {
+                char *ptr;
+                if (NULL != (ptr = strchr(hstname, '.'))) {
+                    *ptr = '\0';
+                }
+            }
+
             sq->hostname = hstname;
             opal_list_append(&default_seq_list, &sq->super);
         }
@@ -255,6 +273,16 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
                 goto error;
             }
             while (NULL != (hstname = orte_getline(fp))) {
+                if (0 == strlen(hstname)) {
+                    free(hstname);
+                    /* blank line - ignore */
+                    continue;
+                }
+                if( '#' == hstname[0] ) {
+                    free(hstname);
+                    /* Comment line - ignore */
+                    continue;
+                }
                 sq = OBJ_NEW(seq_node_t);
                 if (NULL != (sep = strchr(hstname, ' '))) {
                     *sep = '\0';
@@ -267,6 +295,15 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
                     *(eptr+1) = 0;
                     sq->cpuset = strdup(sep);
                 }
+
+                // Strip off the FQDN if present, ignore IP addresses
+                if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(hstname) ) {
+                    char *ptr;
+                    if (NULL != (ptr = strchr(hstname, '.'))) {
+                        (*ptr) = '\0';
+                    }
+                }
+
                 sq->hostname = hstname;
                 opal_list_append(&sq_list, &sq->super);
             }
diff --git a/orte/util/dash_host/dash_host.c b/orte/util/dash_host/dash_host.c
@@ -13,6 +13,7 @@
  * Copyright (c) 2014-2015 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -30,6 +31,7 @@
 #include "orte/util/show_help.h"
 #include "opal/util/argv.h"
 #include "opal/util/if.h"
+#include "opal/util/net.h"
 
 #include "orte/mca/ras/base/base.h"
 #include "orte/mca/plm/plm_types.h"
@@ -207,6 +209,14 @@ int orte_util_add_dash_host_nodes(opal_list_t *nodes,
             ndname = mini_map[i];
         }
 
+        // Strip off the FQDN if present, ignore IP addresses
+        if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(ndname) ) {
+            char *ptr;
+            if (NULL != (ptr = strchr(ndname, '.'))) {
+                *ptr = '\0';
+            }
+        }
+
         /* see if the node is already on the list */
         found = false;
         OPAL_LIST_FOREACH(node, &adds, orte_node_t) {
diff --git a/orte/util/hostfile/hostfile.c b/orte/util/hostfile/hostfile.c
@@ -15,6 +15,7 @@
  * Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -37,6 +38,7 @@
 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
 #include "opal/util/if.h"
+#include "opal/util/net.h"
 #include "opal/mca/installdirs/installdirs.h"
 
 #include "orte/util/show_help.h"
@@ -164,6 +166,14 @@ static int hostfile_parse_line(int token, opal_list_t* updates,
         }
         opal_argv_free (argv);
 
+        // Strip off the FQDN if present, ignore IP addresses
+        if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(node_name) ) {
+            char *ptr;
+            if (NULL != (ptr = strchr(node_name, '.'))) {
+                *ptr = '\0';
+            }
+        }
+
         /* if the first letter of the name is '^', then this is a node
          * to be excluded. Remove the ^ character so the nodename is
          * usable, and put it on the exclude list
@@ -270,6 +280,15 @@ static int hostfile_parse_line(int token, opal_list_t* updates,
             opal_output(0, "WARNING: Unhandled user@host-combination\n"); /* XXX */
         }
         opal_argv_free (argv);
+
+        // Strip off the FQDN if present, ignore IP addresses
+        if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(node_name) ) {
+            char *ptr;
+            if (NULL != (ptr = strchr(node_name, '.'))) {
+                *ptr = '\0';
+            }
+        }
+
         /* Do we need to make a new node object? */
         if (NULL == (node = hostfile_lookup(updates, node_name))) {
             node = OBJ_NEW(orte_node_t);
diff --git a/orte/util/proc_info.c b/orte/util/proc_info.c
@@ -9,10 +9,11 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2009-2016 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012      Los Alamos National Security, LLC.
  *                         All rights reserved.
  * Copyright (c) 2014-2015 Intel, Inc. All rights reserved
+ * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -32,9 +33,6 @@
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#if HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 #include <ctype.h>
 
 #include "opal/mca/base/base.h"
@@ -102,7 +100,6 @@ int orte_proc_info(void)
     char hostname[OPAL_MAXHOSTNAMELEN];
     char **prefixes;
     bool match;
-    struct in_addr buf;
 
     if (init) {
         return ORTE_SUCCESS;
@@ -172,16 +169,12 @@ int orte_proc_info(void)
     /* add this to our list of aliases */
     opal_argv_append_nosize(&orte_process_info.aliases, hostname);
 
-    if (!orte_keep_fqdn_hostnames) {
-        /* if the nodename is an IP address, do not mess with it! */
-        if (0 == inet_pton(AF_INET, hostname, &buf) &&
-            0 == inet_pton(AF_INET6, hostname, &buf)) {
-            /* not an IP address, so remove any domain info */
-            if (NULL != (ptr = strchr(hostname, '.'))) {
-                *ptr = '\0';
-                /* add this to our list of aliases */
-                opal_argv_append_nosize(&orte_process_info.aliases, hostname);
-            }
+    // Strip off the FQDN if present, ignore IP addresses
+    if( !orte_keep_fqdn_hostnames && !opal_net_isaddr(hostname) ) {
+        if (NULL != (ptr = strchr(hostname, '.'))) {
+            *ptr = '\0';
+            /* add this to our list of aliases */
+            opal_argv_append_nosize(&orte_process_info.aliases, hostname);
         }
     }
 
