Skip to content

Commit cff8fae

Browse files
jjhurseyjjhursey
committed
orte: expand scope of the orte_keep_fqdn_hostnames 
1 parent eadff28 commit cff8fae

File tree

8 files changed

+8
-25
lines changed

8 files changed

+8
-25
lines changed

‎orte/mca/rmaps/rank_file/rmaps_rank_file.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ static int orte_rmaps_rank_file_parse(const char *rankfile)
494494
opal_argv_free (argv);
495495

496496
// Strip off the FQDN if present
497-
if( orte_use_mixed_hostnames ) {
497+
if( !orte_keep_fqdn_hostnames ) {
498498
char *ptr;
499499
struct in_addr buf;
500500
/* if the nodename is an IP address, do not mess with it! */

‎orte/mca/rmaps/seq/rmaps_seq.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
192192
}
193193

194194
// Strip off the FQDN if present
195-
if( orte_use_mixed_hostnames ) {
195+
if( !orte_keep_fqdn_hostnames ) {
196196
char *ptr;
197197
struct in_addr buf;
198198

@@ -302,14 +302,14 @@ static int orte_rmaps_seq_map(orte_job_t *jdata)
302302
}
303303

304304
// Strip off the FQDN if present
305-
if( orte_use_mixed_hostnames ) {
305+
if( !orte_keep_fqdn_hostnames ) {
306306
char *ptr;
307307
struct in_addr buf;
308308
/* if the nodename is an IP address, do not mess with it! */
309309
if (0 == inet_pton(AF_INET, hstname, &buf) &&
310310
0 == inet_pton(AF_INET6, hstname, &buf)) {
311311
if (NULL != (ptr = strchr(hstname, '.'))) {
312-
(*ptr) = '\0'; // JJH RETURN HERE TO DETERMINE WHY SEGV...
312+
(*ptr) = '\0';
313313
}
314314
}
315315
}

‎orte/runtime/orte_globals.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved
1717
* Copyright (c) 2014-2015 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
19-
* Copyright (c) 2016 IBM Corporation. All rights reserved.
2019
* $COPYRIGHT$
2120
*
2221
* Additional copyrights may follow
@@ -78,7 +77,6 @@ bool orte_static_ports = false;
7877
char *orte_oob_static_ports = NULL;
7978
bool orte_standalone_operation = false;
8079

81-
bool orte_use_mixed_hostnames = false;
8280
bool orte_keep_fqdn_hostnames = false;
8381
bool orte_have_fqdn_allocation = false;
8482
bool orte_show_resolved_nodenames = false;

‎orte/runtime/orte_globals.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
1515
* All rights reserved.
1616
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved
17-
* Copyright (c) 2016 IBM Corporation. All rights reserved.
1817
* $COPYRIGHT$
1918
*
2019
* Additional copyrights may follow
@@ -461,7 +460,6 @@ ORTE_DECLSPEC extern char *orte_oob_static_ports;
461460
ORTE_DECLSPEC extern bool orte_standalone_operation;
462461

463462
/* nodename flags */
464-
ORTE_DECLSPEC extern bool orte_use_mixed_hostnames;
465463
ORTE_DECLSPEC extern bool orte_keep_fqdn_hostnames;
466464
ORTE_DECLSPEC extern bool orte_have_fqdn_allocation;
467465
ORTE_DECLSPEC extern bool orte_show_resolved_nodenames;

‎orte/runtime/orte_mca_params.c‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* Copyright (c) 2013-2016 Intel, Inc. All rights reserved
1717
* Copyright (c) 2014 Research Organization for Information Science
1818
* and Technology (RIST). All rights reserved.
19-
* Copyright (c) 2016 IBM Corporation. All rights reserved.
2019
* $COPYRIGHT$
2120
*
2221
* Additional copyrights may follow
@@ -422,14 +421,6 @@ int orte_register_params(void)
422421
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
423422
&orte_keep_fqdn_hostnames);
424423

425-
/* whether or not to match short hostnames to FQDN hostnames */
426-
orte_use_mixed_hostnames = false;
427-
(void) mca_base_var_register ("orte", "orte", NULL, "use_mixed_hostnames",
428-
"Whether or not to use mixed hostnames (short == FQDN) [default: no]",
429-
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
430-
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
431-
&orte_use_mixed_hostnames);
432-
433424
/* whether or not to retain aliases of hostnames */
434425
orte_retain_aliases = false;
435426
(void) mca_base_var_register ("orte", "orte", NULL, "retain_aliases",

‎orte/util/dash_host/dash_host.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ int orte_util_add_dash_host_nodes(opal_list_t *nodes,
212212
}
213213

214214
// Strip off the FQDN if present
215-
if( orte_use_mixed_hostnames ) {
215+
if( !orte_keep_fqdn_hostnames ) {
216216
char *ptr;
217217
struct in_addr buf;
218218
/* if the nodename is an IP address, do not mess with it! */

‎orte/util/hostfile/hostfile.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates,
169169
opal_argv_free (argv);
170170

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

291291
// Strip off the FQDN if present
292-
if( orte_use_mixed_hostnames ) {
292+
if( !orte_keep_fqdn_hostnames ) {
293293
char *ptr;
294294
struct in_addr buf;
295295
/* if the nodename is an IP address, do not mess with it! */

‎orte/util/proc_info.c‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* Copyright (c) 2012 Los Alamos National Security, LLC.
1414
* All rights reserved.
1515
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved
16-
* Copyright (c) 2016 IBM Corporation. All rights reserved.
1716
* $COPYRIGHT$
1817
*
1918
* Additional copyrights may follow
@@ -52,7 +51,6 @@
5251

5352
/* provide a connection to a reqd variable */
5453
extern bool orte_keep_fqdn_hostnames;
55-
extern bool orte_use_mixed_hostnames;
5654

5755
#define ORTE_NAME_INVALID {ORTE_JOBID_INVALID, ORTE_VPID_INVALID}
5856

@@ -175,9 +173,7 @@ int orte_proc_info(void)
175173
/* add this to our list of aliases */
176174
opal_argv_append_nosize(&orte_process_info.aliases, hostname);
177175

178-
// These two options should be mutually exclusive
179-
// Cannot specify orte_use_mixed_hostnames=true and orte_keep_fqdn_hostnames=true
180-
if (!orte_keep_fqdn_hostnames || orte_use_mixed_hostnames) {
176+
if (!orte_keep_fqdn_hostnames) {
181177
/* if the nodename is an IP address, do not mess with it! */
182178
if (0 == inet_pton(AF_INET, hostname, &buf) &&
183179
0 == inet_pton(AF_INET6, hostname, &buf)) {

0 commit comments

Comments
 (0)