svn commit: r1094693 - /trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc

[zw...@apache.org]

Author: zwoop
Date: Mon Apr 18 18:41:05 2011
New Revision: 1094693

URL: http://svn.apache.org/viewvc?rev=1094693&view=rev
Log:
TS-741 traffic_manager handles sockets incorrectly: loops error 88: Socket operation on non-socket

Modified:
    trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc

Modified: trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc?rev=1094693&r1=1094692&r2=1094693&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc Mon Apr 18 18:41:05 2011
@@ -101,7 +101,6 @@ drainIncomingChannel(void *arg)
   lmgmt->syslogThrInit();
 
   for (;;) {                    /* Loop draining mgmt network channels */
-
     // linux: set tv.tv_set in select() loop, since linux's select()
     // will update tv with the amount of time not slept (most other
     // implementations do not do this)
@@ -115,8 +114,8 @@ drainIncomingChannel(void *arg)
       if (lmgmt->ccom->receive_fd > 0) {
         FD_SET(lmgmt->ccom->receive_fd, &fdlist);       /* Multicast fd */
       }
+      FD_SET(lmgmt->ccom->reliable_server_fd, &fdlist);   /* TCP Server fd */
     }
-    FD_SET(lmgmt->ccom->reliable_server_fd, &fdlist);   /* TCP Server fd */
 
     mgmt_select(FD_SETSIZE, &fdlist, NULL, NULL, &tv);
 
@@ -149,11 +148,9 @@ drainIncomingChannel(void *arg)
         (lmgmt->ccom->receiveIncomingMessage(message, 61440) > 0)) {
       lmgmt->ccom->handleMultiCastMessage(message);
     } else if (FD_ISSET(lmgmt->ccom->reliable_server_fd, &fdlist)) {
-
       /* Reliable(TCP) request */
       int clilen = sizeof(cli_addr);
-      int req_fd = mgmt_accept(lmgmt->ccom->reliable_server_fd,
-                               (struct sockaddr *) &cli_addr, &clilen);
+      int req_fd = mgmt_accept(lmgmt->ccom->reliable_server_fd, (struct sockaddr *) &cli_addr, &clilen);
       if (req_fd < 0) {
         mgmt_elog(stderr, "[drainIncomingChannel] error accepting " "reliable connection\n");
         continue;