Changeset 4572

Timestamp:

02/17/10 14:12:07 (5 months ago)

Author:

phk

Message:

Try to handle socket state calls that return errno's relating
to the client absconding the TCP connection.

This comes to the fore on Solaris, where not only systemcalls which
push data through sockets (read,write,select...) return these errors,
but also socket-state calls (setsockopt, ioctl, fcntl) do.

Root cause of trouble in #626 & al.

Location:

trunk/varnish-cache

Files:

• bin/varnishd/cache_acceptor.c (modified) (5 diffs)
• include/libvarnish.h (modified) (1 diff)
• lib/libvarnish/tcp.c (modified) (3 diffs)

trunk/varnish-cache/bin/varnishd/cache_acceptor.c

@@ -106 +106 @@
         struct timeval tv;
         socklen_t l;
+        int i;
 
         l = sizeof lin;
-        AZ(getsockopt(fd, SOL_SOCKET, SO_LINGER, &lin, &l));
+        i = getsockopt(fd, SOL_SOCKET, SO_LINGER, &lin, &l);
+        if (i) {
+                TCP_Assert(i);
+                return;
+        }
         assert(l == sizeof lin);
         if (memcmp(&lin, &linger, l))
@@ -115 +120 @@
 #ifdef SO_SNDTIMEO_WORKS
         l = sizeof tv;
-        AZ(getsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, &l));
+        i = getsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, &l);
+        if (i) {
+                TCP_Assert(i);
+                return;
+        }
         assert(l == sizeof tv);
         if (memcmp(&tv, &tv_sndtimeo, l))
@@ -127 +136 @@
 #ifdef SO_RCVTIMEO_WORKS
         l = sizeof tv;
-        AZ(getsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, &l));
+        i = getsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, &l);
+        if (i) {
+                TCP_Assert(i);
+                return;
+        }
         assert(l == sizeof tv);
         if (memcmp(&tv, &tv_rcvtimeo, l))
@@ -169 +182 @@
                 sock_test(sp->fd);
         if (need_linger)
-                AZ(setsockopt(sp->fd, SOL_SOCKET, SO_LINGER,
+                TCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_LINGER,
                     &linger, sizeof linger));
 #ifdef SO_SNDTIMEO_WORKS
         if (need_sndtimeo)
-                AZ(setsockopt(sp->fd, SOL_SOCKET, SO_SNDTIMEO,
+                TCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_SNDTIMEO,
                     &tv_sndtimeo, sizeof tv_sndtimeo));
 #endif
 #ifdef SO_RCVTIMEO_WORKS
         if (need_rcvtimeo)
-                AZ(setsockopt(sp->fd, SOL_SOCKET, SO_RCVTIMEO,
+                TCP_Assert(setsockopt(sp->fd, SOL_SOCKET, SO_RCVTIMEO,
                     &tv_rcvtimeo, sizeof tv_rcvtimeo));
 #endif
@@ -366 +379 @@
          * acceptor thread, to reduce syscall density of the latter.
          */
-        TCP_nonblocking(sp->fd);
-        if (vca_act->pass == NULL)
+        if (TCP_nonblocking(sp->fd))
+                vca_close_session(sp, "remote closed");
+        else if (vca_act->pass == NULL)
                 assert(sizeof sp == write(vca_pipes[1], &sp, sizeof sp));
         else

trunk/varnish-cache/include/libvarnish.h

@@ -61 +61 @@
 #define TCP_PORTBUFSIZE         16
 
+#define TCP_Check(a) ((a) == 0 || errno == ECONNRESET || errno == ENOTCONN)
+
+#define TCP_Assert(a) assert(TCP_Check(a))
+
 void TCP_myname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen);
 void TCP_hisname(int sock, char *abuf, unsigned alen, char *pbuf, unsigned plen);
 int TCP_filter_http(int sock);
-void TCP_blocking(int sock);
-void TCP_nonblocking(int sock);
-void TCP_linger(int sock, int linger);
+int TCP_blocking(int sock);
+int TCP_nonblocking(int sock);
+int TCP_linger(int sock, int linger);
 #ifdef SOL_SOCKET
 void TCP_name(const struct sockaddr *addr, unsigned l, char *abuf,

trunk/varnish-cache/lib/libvarnish/tcp.c

@@ -155 +155 @@
  */
 
-void
+int
 TCP_blocking(int sock)
 {
-        int i;
+        int i, j;
 
         i = 0;
-        AZ(ioctl(sock, FIONBIO, &i));
-}
-
-void
+        j = ioctl(sock, FIONBIO, &i);
+        TCP_Assert(j);
+        return (j);
+}
+
+int
 TCP_nonblocking(int sock)
 {
-        int i;
+        int i, j;
 
         i = 1;
-        AZ(ioctl(sock, FIONBIO, &i));
+        j = ioctl(sock, FIONBIO, &i);
+        TCP_Assert(j);
+        return (j);
 }
 
@@ -256 +260 @@
  */
 
-void
+int
 TCP_linger(int sock, int linger)
 {
@@ -265 +269 @@
         lin.l_onoff = linger;
         i = setsockopt(sock, SOL_SOCKET, SO_LINGER, &lin, sizeof lin);
-        assert(i == 0 || errno == EBADF);
-}
+        TCP_Assert(i);
+        return (i);
+}