svn merge -r9928:9938 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

NEWS

@@ -95,8 +95,6 @@ documents those changes that are of interest to users and admins.
    passthrough nodes to the allocation when creating a block. 
  - BLUEGENE - Fix deadlock issue with starting and failing jobs at the same
    time
- - Make connect() non-blocking and poll to avoid possibly very long default 
-   timeout.
 
 * Changes in SLURM 1.1.17
 =========================

src/common/slurm_protocol_socket_implementation.c

@@ -565,28 +565,33 @@ extern int _slurm_getsockname (int __fd, struct sockaddr * __addr,
 extern int _slurm_connect (int __fd, struct sockaddr const * __addr, 
                                 socklen_t __len)
 {
+#if 1
+	return connect ( __fd , __addr , __len ) ;
+#else
 	/* From "man connect": Note that for IP sockets the timeout
 	 * may be very long when syncookies are enabled on the server.
 	 *
 	 * Timeouts in excess of 3 minutes have been observed, resulting
 	 * in serious problems for slurmctld. Making the connect call 
-	 * non-blocking and polling seems to fix the problem. */
+	 * non-blocking and polling seems to fix the problem on Linux. 
+	 * It fails on AIX. */
 	int rc = -1, flags;
 
 	flags = fcntl(__fd, F_GETFL);
 	fcntl(__fd, F_SETFL, flags | O_NONBLOCK);
-	rc = connect ( __fd , __addr , __len ) ;
-	if ((rc == -1)
-	&&  ((errno == EINPROGRESS) || (errno == EALREADY))) {
+	rc = connect(__fd , __addr , __len);
+	if ((rc == -1) && (errno == EINPROGRESS)) {
 		struct pollfd ufds;
 		ufds.fd = __fd;
 		ufds.events = POLLOUT;
-		ufds. revents = 0;
+		ufds.revents = 0;
 		poll(&ufds, 1, 5000);   /* 5 sec max wait */
-		rc = connect ( __fd , __addr , __len ) ;
+		if (ufds.revents == POLLOUT)
+			rc = connect(__fd , __addr , __len);
 	}
 	fcntl(__fd, F_SETFL, flags);
 	return rc;
+#endif
 }
 
 /* Put the address of the peer connected to socket FD into *ADDR