From: Willy Tarreau <w@1wt.eu>
Date: Wed, 24 Feb 2021 10:08:56 +0000 (+0100)
Subject: BUG/MEDIUM: proxy: use thread-safe stream killing on hard-stop
X-Git-Tag: v2.1.12~30
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=e287b480ba59f92c2757a7cfcef1f7a86c337ca0;p=haproxy-2.1.git

BUG/MEDIUM: proxy: use thread-safe stream killing on hard-stop

When setting hard-stop-after, hard_stop() is called at the end to kill
last pending streams. Unfortunately there's no locking there while
walking over the streams list nor when shutting them down, so it's
very likely that some old processes have been crashing or gone wild
due to this. Let's use a thread_isolate() call for this as we don't
have much other choice (and it happens once in the process' life,
that's OK).

This must be backported to 1.8.

(cherry picked from commit 92b887e20a995323d3fbd42d2be035733cefd6ba)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit be9833e3248c84d3a911c215125975003c29d688)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit df925ed60b5debbd3a9895b214b4984f8e72587f)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
---

diff --git a/src/proxy.c b/src/proxy.c
index df4668e..70ef1ca 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1096,9 +1096,12 @@ struct task *hard_stop(struct task *t, void *context, unsigned short state)
 		}
 		p = p->next;
 	}
+
+	thread_isolate();
 	list_for_each_entry(s, &streams, list) {
 		stream_shutdown(s, SF_ERR_KILLED);
 	}
+	thread_release();
 
 	killed = 1;
 	t->expire = tick_add(now_ms, MS_TO_TICKS(1000));