From 7c6b6d50d0f4f1d1d0840133f29e9f60099aeda1 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 6 Apr 2007 22:52:15 +0000
Subject: [PATCH] svn merge -r11322:11325
https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
---
src/common/slurm_protocol_socket_implementation.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/common/slurm_protocol_socket_implementation.c b/src/common/slurm_protocol_socket_implementation.c
index 672e0406381..1a257fbda8d 100644
--- a/src/common/slurm_protocol_socket_implementation.c
+++ b/src/common/slurm_protocol_socket_implementation.c
@@ -593,10 +593,14 @@ extern int _slurm_connect (int __fd, struct sockaddr const * __addr,
ufds.events = POLLIN | POLLOUT;
ufds.revents = 0;
- rc = poll(&ufds, 1, 5000);
+again: rc = poll(&ufds, 1, 5000);
if (rc == -1) {
/* poll failed */
- error("_slurm_connect poll failed: %m");
+ if (errno == EINTR) {
+ verbose("_slurm_connect poll failed: %m");
+ goto again;
+ } else
+ error("_slurm_connect poll failed: %m");
return -1;
} else if (rc == 0) {
/* poll timed out before any socket events */
--
GitLab