Skip to content

v4.1.x: Unlink and rebind socket when session directory already exists #9266

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

Merged
jsquyres merged 1 commit into from
Aug 29, 2021
Merged

v4.1.x: Unlink and rebind socket when session directory already exists #9266

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
35 changes: 32 additions & 3 deletions orte/util/listener.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif

#include <ctype.h>

Expand Down Expand Up @@ -90,6 +93,7 @@ int orte_register_listener(struct sockaddr* address, opal_socklen_t addrlen,
orte_listener_callback_fn_t handler)
{
orte_listener_t *conn;
struct sockaddr_un * sa_un;
int flags;
int sd = -1;

Expand Down Expand Up @@ -135,12 +139,36 @@ int orte_register_listener(struct sockaddr* address, opal_socklen_t addrlen,


if (bind(sd, (struct sockaddr*)address, addrlen) < 0) {
opal_output(0, "%s bind() failed on error %s (%d)",
opal_output(0, "%s bind() %s (%d)"
"checking for existing socket connection\n",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
strerror(opal_socket_errno),
opal_socket_errno );
CLOSE_THE_SOCKET(sd);
return ORTE_ERROR;
if(address->sa_family == AF_UNIX) {
sa_un = (struct sockaddr_un *)address;
if (connect(sd, (struct sockaddr *)address, addrlen) < 0) {
opal_output(0, "socket: %s is inactive, "
"unlinking the socket file and rebinding\n",sa_un->sun_path);
unlink(sa_un->sun_path);
if (bind(sd, (struct sockaddr *)address, addrlen) < 0) {
opal_output(0, "bind() failed on file: %s even after unlink\n",
sa_un->sun_path);
CLOSE_THE_SOCKET(sd);
return ORTE_ERROR;
}
} else {
opal_output(0, "%s bind() failed : socket is active %s (%d)\n",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
strerror(opal_socket_errno), opal_socket_errno );
CLOSE_THE_SOCKET(sd);
return ORTE_ERROR;
}
} else {
opal_output(0, "%s bind() failed : not an unix domain socket",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
CLOSE_THE_SOCKET(sd);
return ORTE_ERROR;
}
}

/* setup listen backlog to maximum allowed by kernel */
Expand Down Expand Up @@ -379,3 +407,4 @@ OBJ_CLASS_INSTANCE(orte_pending_connection_t,
opal_object_t,
NULL,
NULL);