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

Ensure that daemons NEVER initiate connections to childs #4630

Merged
merged 1 commit into from
Jan 3, 2018
Merged

Ensure that daemons NEVER initiate connections to childs #4630

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
9 changes: 7 additions & 2 deletions orte/mca/oob/usock/oob_usock.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-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -283,7 +283,7 @@ static void process_send(int fd, short args, void *cbdata)
/* try this again after a delay for N times */
op->reps++;
if (20 < op->reps) {
/* we don't know how to talk to this proc,
/* we don't know how to talk to this proc,
* so send this back up to the OOB base so it
* can try another transport
*/
Expand Down Expand Up @@ -326,6 +326,11 @@ static void process_send(int fd, short args, void *cbdata)
*/
MCA_OOB_USOCK_QUEUE_PENDING(op->msg, peer);

/* if we are the HNP or daemon, we NEVER initiate connections */
if (ORTE_PROC_IS_HNP || ORTE_PROC_IS_DAEMON) {
return;
}

if (MCA_OOB_USOCK_CONNECTING != peer->state &&
MCA_OOB_USOCK_CONNECT_ACK != peer->state) {
/* we have to initiate the connection - again, we do not
Expand Down