microsoft/mscclpp
1
0
Fork 0
mirror of https://github.com/microsoft/mscclpp.git synced 2026-05-12 17:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

retry for almost 20 seconds

Browse Source
This commit is contained in:
Saeed Maleki
2023-03-24 19:42:00 +00:00
parent 7a4c27778f
commit 35b8ebaf64
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bootstrap/socket.cc
View File

@@ -12,8 +12,6 @@
#include <ifaddrs.h>
#include <net/if.h>
#define MSCCLPP_SOCKET_ACCEPT_TIMEOUT 30
static mscclppResult_t socketProgressOpt(int op, struct mscclppSocket* sock, void* ptr, int size, int* offset, int block, int* closed) {
int bytes = 0;
*closed = 0;
@@ -408,19 +406,19 @@ mscclppResult_t mscclppSocketGetAddr(struct mscclppSocket* sock, union mscclppSo
}
static mscclppResult_t socketTryAccept(struct mscclppSocket* sock) {
static double initTime = -1;
if (initTime == -1) initTime = clockSec();
socklen_t socklen = sizeof(union mscclppSocketAddress);
sock->fd = accept(sock->acceptFd, &sock->addr.sa, &socklen);
if (sock->fd != -1) {
sock->state = mscclppSocketStateAccepted;
initTime = -1;
} else if (errno != EAGAIN && errno != EWOULDBLOCK) {
WARN("socketTryAccept: get errno %d that is not EAGAIN or EWOULDBLOCK", errno);
return mscclppSystemError;
} else if (clockSec() - initTime > MSCCLPP_SOCKET_ACCEPT_TIMEOUT) {
WARN("socketTryAccept: exceeded timeout (%d sec)", MSCCLPP_SOCKET_ACCEPT_TIMEOUT);
} else if (++sock->acceptRetries == RETRY_ACCEPT_TIMES) {
WARN("socketTryAccept: exceeded retries (%d)", sock->acceptRetries);
return mscclppRemoteError;
} else {
usleep(SLEEP_INT);
if (sock->acceptRetries % 1000 == 0) INFO(MSCCLPP_ALL, "socketTryAccept: Call to try accept returned %s, retrying", strerror(errno));
}
return mscclppSuccess;
}
@@ -699,6 +697,7 @@ mscclppResult_t mscclppSocketInit(struct mscclppSocket* sock, union mscclppSocke
if (sock == NULL) goto exit;
sock->timedOutRetries = 0;
sock->refusedRetries = 0;
sock->acceptRetries = 0;
sock->abortFlag = abortFlag;
sock->asyncFlag = asyncFlag;
sock->state = mscclppSocketStateInitialized;

2
src/include/socket.h
View File

@@ -20,6 +20,7 @@
#define SLEEP_INT 1000 // connection retry sleep interval in usec
#define RETRY_REFUSED_TIMES 2e4 // connection refused retry times before reporting a timeout (20 sec)
#define RETRY_TIMEDOUT_TIMES 3 // connection timed out retry times (each one can take 20s)
#define RETRY_ACCEPT_TIMES 2e4 // connection accept retry times (each one can take 20s)
#define SOCKET_NAME_MAXLEN (NI_MAXHOST+NI_MAXSERV)
#define MSCCLPP_SOCKET_MAGIC 0x564ab9f2fc4b9d6cULL
@@ -57,6 +58,7 @@ struct mscclppSocket {
int acceptFd;
int timedOutRetries;
int refusedRetries;
int acceptRetries;
union mscclppSocketAddress addr;
volatile uint32_t* abortFlag;
int asyncFlag;