From 3053885f8774c8c08d00d62097ba2a3271f9e8cd Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 7 Apr 2014 13:25:11 -0700
Subject: [PATCH] Restore 1sec msg connect retry
This largely reverts commit 0ec2af2735ee91b46fd5b59a9cd1318ef3411aca
just to cut down on some logging
---
src/common/slurm_protocol_api.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index 294ed10fa9b..fdf353b65e2 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -2199,10 +2199,9 @@ slurm_fd_t slurm_open_controller_conn(slurm_addr_t *addr)
myproto->primary_controller.sin_port;
}
- msg_timeout *= 10; /* Do iteration every 0.1 secs */
for (retry = 0; retry < msg_timeout; retry++) {
if (retry)
- usleep(100000);
+ sleep(1);
if (working_cluster_rec) {
if (working_cluster_rec->control_addr.sin_port == 0) {
slurm_set_addr(
@@ -3683,12 +3682,11 @@ List slurm_send_addr_recv_msgs(slurm_msg_t *msg, char *name, int timeout)
if (conn_timeout == (uint16_t) NO_VAL)
conn_timeout = MIN(slurm_get_msg_timeout(), 10);
- conn_timeout *= 10; /* Do iteration every 0.1 secs */
/* This connect retry logic permits Slurm hierarchical communications
* to better survive slurmd restarts */
for (i = 0; i <= conn_timeout; i++) {
- if (i > 0)
- usleep(100000);
+ if (i)
+ sleep(1);
fd = slurm_open_msg_conn(&msg->address);
if ((fd >= 0) || (errno != ECONNREFUSED))
break;
--
GitLab