1.1 --- a/orte/mca/ess/base/ess_base_std_orted.c Tue Mar 19 19:41:11 2013 +0000
1.2 +++ b/orte/mca/ess/base/ess_base_std_orted.c Thu Mar 21 16:41:34 2013 +0000
1.3 @@ -316,13 +316,13 @@
1.4 goto error;
1.5 }
1.6 #if ORTE_ENABLE_STATIC_PORTS
1.7 - /* if we are using static ports or a common port, then we need to setup
1.8 + /* if we are using static ports, then we need to setup
1.9 * the daemon info so the RML can function properly
1.10 * without requiring a wireup stage. This must be done
1.11 * after we enable_comm as that function determines our
1.12 * own port, which we need in order to construct the nidmap
1.13 */
1.14 - if (orte_static_ports || orte_use_common_port) {
1.15 + if (orte_static_ports) {
1.16 /* define the routing tree so we know the pattern
1.17 * if we are trying to setup common or static ports
1.18 */
2.1 --- a/orte/mca/oob/tcp/oob_tcp.c Tue Mar 19 19:41:11 2013 +0000
2.2 +++ b/orte/mca/oob/tcp/oob_tcp.c Thu Mar 21 16:41:34 2013 +0000
2.3 @@ -651,15 +651,7 @@
2.4 port in the range. Otherwise, tcp_port_min will be 0, which
2.5 means "pick any port" */
2.6 if (AF_INET == af_family) {
2.7 - if (ORTE_PROC_IS_DAEMON && orte_use_common_port) {
2.8 - /* use the same port as the HNP */
2.9 - char *ptr, *portptr;
2.10 - portptr = strdup(orte_process_info.my_hnp_uri);
2.11 - ptr = strrchr(portptr, ':');
2.12 - ptr++;
2.13 - opal_argv_append_nosize(&ports, ptr);
2.14 - free(portptr);
2.15 - } else if (ORTE_PROC_IS_HNP || ORTE_PROC_IS_DAEMON) {
2.16 + if (ORTE_PROC_IS_HNP || ORTE_PROC_IS_DAEMON) {
2.17 if (NULL != mca_oob_tcp_component.tcp4_static_ports) {
2.18 /* if static ports were provided, the daemon takes the
2.19 * first entry in the list
3.1 --- a/orte/mca/plm/base/plm_base_launch_support.c Tue Mar 19 19:41:11 2013 +0000
3.2 +++ b/orte/mca/plm/base/plm_base_launch_support.c Thu Mar 21 16:41:34 2013 +0000
3.3 @@ -983,8 +983,8 @@
3.4 opal_argv_append(argc, argv, param);
3.5 free(param);
3.6
3.7 - /* if given and we have static ports or are using a common port, pass the node list */
3.8 - if ((orte_static_ports || orte_use_common_port) && NULL != nodes) {
3.9 + /* if we have static ports, pass the node list */
3.10 + if (orte_static_ports && NULL != nodes) {
3.11 /* convert the nodes to a regex */
3.12 if (ORTE_SUCCESS != (rc = orte_regex_create(nodes, ¶m))) {
3.13 ORTE_ERROR_LOG(rc);
3.14 @@ -996,15 +996,6 @@
3.15 free(param);
3.16 }
3.17
3.18 - if (orte_use_common_port) {
3.19 - /* tell the daemon to use the common port */
3.20 - opal_argv_append(argc, argv, "--use-common-port");
3.21 - } else {
3.22 - opal_argv_append(argc, argv, "-mca");
3.23 - opal_argv_append(argc, argv, "orte_use_common_port");
3.24 - opal_argv_append(argc, argv, "0");
3.25 - }
3.26 -
3.27 /* warn the daemons if we are using a tree spawn pattern so they
3.28 * know they shouldn't do a rollup on their callback
3.29 */
4.1 --- a/orte/mca/plm/rsh/plm_rsh_module.c Tue Mar 19 19:41:11 2013 +0000
4.2 +++ b/orte/mca/plm/rsh/plm_rsh_module.c Thu Mar 21 16:41:34 2013 +0000
4.3 @@ -793,11 +793,6 @@
4.4 goto cleanup;
4.5 }
4.6
4.7 - /* ensure the system knows we are not using common ports since we are
4.8 - * doing a tree spawn
4.9 - */
4.10 - orte_use_common_port = false;
4.11 -
4.12 /* setup the launch */
4.13 if (ORTE_SUCCESS != (rc = setup_launch(&argc, &argv, orte_process_info.nodename, &node_name_index1,
4.14 &proc_vpid_index, prefix))) {
4.15 @@ -1090,11 +1085,6 @@
4.16 opal_byte_object_t bo, *boptr;
4.17 orte_job_t *jdatorted;
4.18
4.19 - /* ensure all systems know we are not using a common port since we
4.20 - * are doing a tree spawn
4.21 - */
4.22 - orte_use_common_port = false;
4.23 -
4.24 /* get the tree spawn buffer */
4.25 orte_tree_launch_cmd = OBJ_NEW(opal_buffer_t);
4.26 /* insert the tree_spawn cmd */
5.1 --- a/orte/mca/plm/slurm/plm_slurm_module.c Tue Mar 19 19:41:11 2013 +0000
5.2 +++ b/orte/mca/plm/slurm/plm_slurm_module.c Thu Mar 21 16:41:34 2013 +0000
5.3 @@ -148,9 +148,6 @@
5.4 return rc;
5.5 }
5.6
5.7 - /* lock OFF the common port for now */
5.8 - orte_use_common_port = false;
5.9 -
5.10 return rc;
5.11 }
5.12
6.1 --- a/orte/mca/routed/binomial/routed_binomial.c Tue Mar 19 19:41:11 2013 +0000
6.2 +++ b/orte/mca/routed/binomial/routed_binomial.c Thu Mar 21 16:41:34 2013 +0000
6.3 @@ -375,7 +375,7 @@
6.4
6.5 /* THIS CAME FROM OUR OWN JOB FAMILY... */
6.6 if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, ORTE_PROC_MY_HNP, target)) {
6.7 - if (!hnp_direct || orte_static_ports || orte_use_common_port) {
6.8 + if (!hnp_direct || orte_static_ports) {
6.9 OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output,
6.10 "%s routing to the HNP through my parent %s",
6.11 ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
7.1 --- a/orte/mca/routed/debruijn/routed_debruijn.c Tue Mar 19 19:41:11 2013 +0000
7.2 +++ b/orte/mca/routed/debruijn/routed_debruijn.c Thu Mar 21 16:41:34 2013 +0000
7.3 @@ -385,7 +385,7 @@
7.4 /* THIS CAME FROM OUR OWN JOB FAMILY... */
7.5
7.6 if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, ORTE_PROC_MY_HNP, target)) {
7.7 - if (!hnp_direct || orte_static_ports || orte_use_common_port) {
7.8 + if (!hnp_direct || orte_static_ports) {
7.9 OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output,
7.10 "%s routing to the HNP through my parent %s",
7.11 ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
7.12 @@ -489,8 +489,8 @@
7.13 return rc;
7.14 }
7.15
7.16 - /* if we are using static ports or a common port, set my lifeline to point at my parent */
7.17 - if (orte_static_ports || orte_use_common_port) {
7.18 + /* if we are using static ports, set my lifeline to point at my parent */
7.19 + if (orte_static_ports) {
7.20 lifeline = ORTE_PROC_MY_PARENT;
7.21 } else {
7.22 /* set our lifeline to the HNP - we will abort if that connection is lost */
8.1 --- a/orte/mca/routed/radix/routed_radix.c Tue Mar 19 19:41:11 2013 +0000
8.2 +++ b/orte/mca/routed/radix/routed_radix.c Thu Mar 21 16:41:34 2013 +0000
8.3 @@ -379,7 +379,7 @@
8.4 * how to get there - otherwise, send it via the tree
8.5 */
8.6 if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, ORTE_PROC_MY_HNP, target)) {
8.7 - if (!hnp_direct || orte_static_ports || orte_use_common_port) {
8.8 + if (!hnp_direct || orte_static_ports) {
8.9 OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output,
8.10 "%s routing to the HNP through my parent %s",
8.11 ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
9.1 --- a/orte/orted/orted_main.c Tue Mar 19 19:41:11 2013 +0000
9.2 +++ b/orte/orted/orted_main.c Thu Mar 21 16:41:34 2013 +0000
9.3 @@ -171,10 +171,6 @@
9.4 NULL, OPAL_CMD_LINE_TYPE_STRING,
9.5 "URI for the parent if tree launch is enabled."},
9.6
9.7 - { "orte", "use", "common_port", '\0', NULL, "use-common-port", 0,
9.8 - NULL, OPAL_CMD_LINE_TYPE_BOOL,
9.9 - "Use the same port as the HNP."},
9.10 -
9.11 { NULL, NULL, NULL, '\0', NULL, "tree-spawn", 0,
9.12 &orted_globals.tree_spawn, OPAL_CMD_LINE_TYPE_BOOL,
9.13 "Tree spawn is underway"},
9.14 @@ -743,7 +739,7 @@
9.15 }
9.16 #endif
9.17
9.18 - if ((orte_static_ports || orte_use_common_port) && !orted_globals.tree_spawn) {
9.19 + if (orte_static_ports && !orted_globals.tree_spawn) {
9.20 /* use the rollup collective to send our data to the HNP
9.21 * so we minimize the HNP bottleneck
9.22 */
10.1 --- a/orte/runtime/orte_globals.c Tue Mar 19 19:41:11 2013 +0000
10.2 +++ b/orte/runtime/orte_globals.c Thu Mar 21 16:41:34 2013 +0000
10.3 @@ -75,7 +75,6 @@
10.4 bool orte_static_ports = false;
10.5 char *orte_oob_static_ports = NULL;
10.6 bool orte_standalone_operation = false;
10.7 -bool orte_use_common_port = false;
10.8
10.9 bool orte_keep_fqdn_hostnames = false;
10.10 bool orte_have_fqdn_allocation = false;
11.1 --- a/orte/runtime/orte_globals.h Tue Mar 19 19:41:11 2013 +0000
11.2 +++ b/orte/runtime/orte_globals.h Thu Mar 21 16:41:34 2013 +0000
11.3 @@ -581,7 +581,6 @@
11.4 ORTE_DECLSPEC extern bool orte_static_ports;
11.5 ORTE_DECLSPEC extern char *orte_oob_static_ports;
11.6 ORTE_DECLSPEC extern bool orte_standalone_operation;
11.7 -ORTE_DECLSPEC extern bool orte_use_common_port;
11.8
11.9 /* nodename flags */
11.10 ORTE_DECLSPEC extern bool orte_keep_fqdn_hostnames;
12.1 --- a/orte/runtime/orte_mca_params.c Tue Mar 19 19:41:11 2013 +0000
12.2 +++ b/orte/runtime/orte_mca_params.c Thu Mar 21 16:41:34 2013 +0000
12.3 @@ -552,15 +552,6 @@
12.4 "Maximum size of virtual machine - used to subdivide allocation",
12.5 false, false, -1, &orte_max_vm_size);
12.6
12.7 -#if ORTE_ENABLE_STATIC_PORTS
12.8 - mca_base_param_reg_int_name("orte", "use_common_port",
12.9 - "Daemons use same port as HNP",
12.10 - false, false, (int)true, &value);
12.11 - orte_use_common_port = OPAL_INT_TO_BOOL(value);
12.12 -#else
12.13 - orte_use_common_port = false;
12.14 -#endif
12.15 -
12.16 #endif /* ORTE_DISABLE_FULL_SUPPORT */
12.17
12.18 return ORTE_SUCCESS;
13.1 --- a/orte/util/hostfile/hostfile.c Tue Mar 19 19:41:11 2013 +0000
13.2 +++ b/orte/util/hostfile/hostfile.c Thu Mar 21 16:41:34 2013 +0000
13.3 @@ -724,6 +724,8 @@
13.4 * our local name, and yet still be intended to match,
13.5 * we have to check for local interfaces
13.6 */
13.7 + opal_output(0, "HOSTFILE: CHECKING FILE NODE %s VS LIST NODE %s",
13.8 + node_from_file->name, node_from_list->name);
13.9 if (0 == strcmp(node_from_file->name, node_from_list->name) ||
13.10 (opal_ifislocal(node_from_list->name) &&
13.11 opal_ifislocal(node_from_file->name))) {