Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4.0.x: Be a little less restrictive on interface requirements #6967

Merged
merged 1 commit into from
Sep 9, 2019
Merged

v4.0.x: Be a little less restrictive on interface requirements #6967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion orte/mca/oob/tcp/help-oob-tcp.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# University of Stuttgart. All rights reserved.
# Copyright (c) 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
# Copyright (c) 2014-2019 Intel, Inc. All rights reserved.
# Copyright (c) 2015-2018 Cisco Systems, Inc. All rights reserved
# $COPYRIGHT$
#
Expand Down Expand Up @@ -132,3 +132,7 @@ up aborting your job.
Peer host: %s
Peer process name: %s
Peer Open MPI version: %s
#
[no-listeners]
No sockets were able to be opened on the available protocols
(IPv4 and/or IPv6). Please check your network and retry.
20 changes: 10 additions & 10 deletions orte/mca/oob/tcp/oob_tcp_listener.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* All rights reserved.
* Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2013-2019 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -98,7 +98,7 @@ static void connection_event_handler(int sd, short flags, void* cbdata);
*/
int orte_oob_tcp_start_listening(void)
{
int rc;
int rc = ORTE_SUCCESS, rc2 = ORTE_SUCCESS;
mca_oob_tcp_listener_t *listener;

/* if we don't have any TCP interfaces, we shouldn't be here */
Expand All @@ -112,19 +112,19 @@ int orte_oob_tcp_start_listening(void)
}

/* create listen socket(s) for incoming connection attempts */
if (ORTE_SUCCESS != (rc = create_listen())) {
ORTE_ERROR_LOG(rc);
return rc;
}
rc = create_listen();

#if OPAL_ENABLE_IPV6
/* create listen socket(s) for incoming connection attempts */
if (ORTE_SUCCESS != (rc = create_listen6())) {
ORTE_ERROR_LOG(rc);
return rc;
}
rc2 = create_listen6();
#endif

if (ORTE_SUCCESS != rc && ORTE_SUCCESS != rc2) {
/* we were unable to open any listening sockets */
opal_show_help("help-oob-tcp.txt", "no-listeners", true);
return ORTE_ERR_FATAL;
}

/* if I am the HNP, start a listening thread so we can
* harvest connection requests as rapidly as possible
*/
Expand Down