From: Willy Tarreau <w@1wt.eu>
Date: Tue, 21 Sep 2010 19:14:29 +0000 (+0200)
Subject: [BUG] stream_sock: cleanly disable the listener in case of resource shortage
X-Git-Tag: v1.5-dev8~465
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9f32dbf5ce28396bcab9c954bf3180f75b0ff53;p=thirdparty%2Fhaproxy.git

[BUG] stream_sock: cleanly disable the listener in case of resource shortage

Jozsef R.Nagy reported a reliability issue on FreeBSD. Sometimes an error
would be emitted, reporting the inability to switch a socket to non-blocking
mode and the listener would definitely not accept anything. Cyril Bonté
narrowed this bug down to the call to EV_FD_CLR(l->fd, DIR_RD).

He was right because this call is wrong. It only disables input events on
the listening socket, without setting the listener to the LI_LISTEN state,
so any subsequent call to enable_listener() from maintain_proxies() is
ignored ! The correct fix consists in calling disable_listener() instead.

It is discutable whether we should keep such error path or just ignore the
event. The goal in earlier versions was to temporarily disable new activity
in order to let the system recover while releasing resources.
---

diff --git a/src/stream_sock.c b/src/stream_sock.c
index d72d0e5a51..64e3530654 100644
--- a/src/stream_sock.c
+++ b/src/stream_sock.c
@@ -1205,7 +1205,7 @@ int stream_sock_accept(int fd)
 		if (unlikely(ret < 0)) {
 			/* critical error encountered, generally a resource shortage */
 			if (p) {
-				EV_FD_CLR(fd, DIR_RD);
+				disable_listener(l);
 				p->state = PR_STIDLE;
 			}
 			jobs--;