svn merge -r10092:10107 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

NEWS

@@ -105,6 +105,7 @@ documents those changes that are of interest to users and admins.
 =========================
  - BLUEGENE - make sure the order of blocks read in from the bluegene.conf
    are created in that order (static mode).
+ - Fix logic in connect(), slurmctld fail-over was broken in v1.1.18.
 
 * Changes in SLURM 1.1.18
 =========================

src/common/slurm_protocol_socket_implementation.c

@@ -588,8 +588,14 @@ extern int _slurm_connect (int __fd, struct sockaddr const * __addr,
 		poll_rc = poll(&ufds, 1, 5000);
 		if (poll_rc == 0)
                         errno = ETIMEDOUT;
-		else if (poll_rc == 1)
-			rc = 0;
+		else if (poll_rc == 1) {
+			/* poll successfully completed */
+			if (ufds.revents & POLLERR)
+				debug2("connect failure");
+			else
+				rc = 0;
+		} else
+			error("poll: %m");
 	}
 	fcntl(__fd, F_SETFL, flags);
 	return rc;