orte: Expand application of !orte_keep_fqdn_hostnames

 * Related to c0038eded3544db94f68f3d5b58c89739834eb96
 * See discussion on Open MPI community PR:
   - open-mpi#2015
 * After broader discussion it was decided to expand the use of the
   !orte_keep_fqdn_hostnames MCA parameter to shorten all hostnames.
   This was exactly what the orte_use_mixed_hostnames MCA parameter
   was doing.
   - This also means that the LSF folks will get the behavior they
     want by default in Open MPI.
 * Upstream will see one commit that combines this commit and
   c0038eded3544db94f68f3d5b58c89739834eb96

(cherry picked from commit a33a2308ca80766fe6cf1f217b5a467687669603)

Author: jjhursey

orte/mca/rmaps/rank_file/rmaps_rank_file.c

@@ -505,7 +505,7 @@ static int orte_rmaps_rank_file_parse(const char *rankfile)
                         opal_argv_free (argv);
 
                         // Strip off the FQDN if present
-                        if( orte_use_mixed_hostnames ) {
+                        if( !orte_keep_fqdn_hostnames ) {
                             char *ptr;
                             struct in_addr buf;
                             /* if the nodename is an IP address, do not mess with it! */

orte/mca/rmaps/seq/rmaps_seq.c

@@ -193,7 +193,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
             }
 
             // Strip off the FQDN if present
-            if( orte_use_mixed_hostnames ) {
+            if( !orte_keep_fqdn_hostnames ) {
                 char *ptr;
                 struct in_addr buf;
 
@@ -307,14 +307,14 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
                 }
 
                 // Strip off the FQDN if present
-                if( orte_use_mixed_hostnames ) {
+                if( !orte_keep_fqdn_hostnames ) {
                     char *ptr;
                     struct in_addr buf;
                     /* if the nodename is an IP address, do not mess with it! */
                     if (0 == inet_pton(AF_INET, hstname, &buf) &&
                         0 == inet_pton(AF_INET6, hstname, &buf)) {
                         if (NULL != (ptr = strchr(hstname, '.'))) {
-                            (*ptr) = '\0'; // JJH RETURN HERE TO DETERMINE WHY SEGV...
+                            (*ptr) = '\0';
                         }
                     }
                 }

orte/runtime/orte_globals.c

@@ -85,7 +85,6 @@ char *orte_oob_static_ports = NULL;
 bool orte_standalone_operation = false;
 bool orte_fwd_mpirun_port = true;
 
-bool orte_use_mixed_hostnames = false;
 bool orte_keep_fqdn_hostnames = false;
 bool orte_have_fqdn_allocation = false;
 bool orte_show_resolved_nodenames = false;

orte/runtime/orte_globals.h

@@ -470,7 +470,6 @@ ORTE_DECLSPEC extern bool orte_standalone_operation;
 ORTE_DECLSPEC extern bool orte_fwd_mpirun_port;
 
 /* nodename flags */
-ORTE_DECLSPEC extern bool orte_use_mixed_hostnames;
 ORTE_DECLSPEC extern bool orte_keep_fqdn_hostnames;
 ORTE_DECLSPEC extern bool orte_have_fqdn_allocation;
 ORTE_DECLSPEC extern bool orte_show_resolved_nodenames;

orte/runtime/orte_mca_params.c

@@ -422,14 +422,6 @@ int orte_register_params(void)
                                   OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
                                   &orte_keep_fqdn_hostnames);
 
-    /* whether or not to match short hostnames to FQDN hostnames */
-    orte_use_mixed_hostnames = false;
-    (void) mca_base_var_register ("orte", "orte", NULL, "use_mixed_hostnames",
-                                  "Whether or not to use mixed hostnames (short == FQDN) [default: no]",
-                                  MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
-                                  OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
-                                  &orte_use_mixed_hostnames);
-
     /* whether or not to retain aliases of hostnames */
     orte_retain_aliases = false;
     (void) mca_base_var_register ("orte", "orte", NULL, "retain_aliases",

orte/util/dash_host/dash_host.c

@@ -217,7 +217,7 @@ int orte_util_add_dash_host_nodes(opal_list_t *nodes,
 
 
         // Strip off the FQDN if present
-        if( orte_use_mixed_hostnames ) {
+        if( !orte_keep_fqdn_hostnames ) {
             char *ptr;
             struct in_addr buf;
             /* if the nodename is an IP address, do not mess with it! */

orte/util/hostfile/hostfile.c

@@ -170,7 +170,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates,
         opal_argv_free (argv);
 
         // Strip off the FQDN if present
-        if( orte_use_mixed_hostnames ) {
+        if( !orte_keep_fqdn_hostnames ) {
             char *ptr;
             struct in_addr buf;
             /* if the nodename is an IP address, do not mess with it! */
@@ -290,7 +290,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates,
         opal_argv_free (argv);
 
         // Strip off the FQDN if present
-        if( orte_use_mixed_hostnames ) {
+        if( !orte_keep_fqdn_hostnames ) {
             char *ptr;
             struct in_addr buf;
             /* if the nodename is an IP address, do not mess with it! */

orte/util/proc_info.c

@@ -49,7 +49,6 @@
 
 /* provide a connection to a reqd variable */
 extern bool orte_keep_fqdn_hostnames;
-extern bool orte_use_mixed_hostnames;
 
 #define ORTE_NAME_INVALID {ORTE_JOBID_INVALID, ORTE_VPID_INVALID}
 
@@ -170,9 +169,7 @@ int orte_proc_info(void)
     /* add this to our list of aliases */
     opal_argv_append_nosize(&orte_process_info.aliases, hostname);
 
-    // These two options should be mutually exclusive
-    // Cannot specify orte_use_mixed_hostnames=true and orte_keep_fqdn_hostnames=true
-    if (!orte_keep_fqdn_hostnames || orte_use_mixed_hostnames) {
+    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)) {