From afb63bc040ab53db7520eaef49b79970d2b636d9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 30 Mar 2021 18:51:07 +0200 Subject: [PATCH] BUILD: backend: fix build breakage in idle conn locking fix The IDLE_CONNS_LOCK is called OTHER_LOCK in 2.3, but as it's only used by developers when -DDEBUG_THREAD is used, it didn't show up when commit 5e22cf3a9 ("MEDIUM: backend: use a trylock to grab a connection on high FD counts as well") was backported to 2.3. There's no upstream commit since it's a pure 2.3 fix. --- src/backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend.c b/src/backend.c index cdb3c1c..f7f871f 100644 --- a/src/backend.c +++ b/src/backend.c @@ -1358,7 +1358,7 @@ int connect_server(struct stream *s) // see it possibly larger. ALREADY_CHECKED(i); - if (HA_SPIN_TRYLOCK(IDLE_CONNS_LOCK, &idle_conns[i].takeover_lock) != 0) + if (HA_SPIN_TRYLOCK(OTHER_LOCK, &idle_conns[i].takeover_lock) != 0) continue; tokill_conn = MT_LIST_POP(&srv->idle_conns[i], -- 1.7.10.4