Another VCA shutdown race.

57cb0598 · Poul-Henning Kamp · Lasse Karstensen · 13586c02 · 57cb0598
Commit 57cb0598 authored Feb 08, 2016 by Poul-Henning Kamp Committed by Lasse Karstensen Feb 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

cache_acceptor.c bin/varnishd/cache/cache_acceptor.c +8 -1

No files found.
--- a/bin/varnishd/cache/cache_acceptor.c
+++ b/bin/varnishd/cache/cache_acceptor.c
@@ -405,6 +405,12 @@ vca_accept_task(struct worker *wrk, void *arg)
 				   &wa.acceptaddrlen);
 		} while (i < 0 && errno == EAGAIN);

+		if (i < 0 && ls->sock == -2) {
+			/* Shut down in progress */
+			sleep(2);
+			continue;
+		}
+
 		if (i < 0) {
 			switch (errno) {
 			case ECONNABORTED:
@@ -416,7 +422,8 @@ vca_accept_task(struct worker *wrk, void *arg)
 			case EBADF:
 				VSL(SLT_Debug, ls->sock, "Accept failed: %s",
 				    strerror(errno));
-				return;
+				vca_pace_bad();
+				break;
 			default:
 				VSL(SLT_Debug, ls->sock, "Accept failed: %s",
 				    strerror(errno));