From: Willy Tarreau <w@1wt.eu>
Date: Wed, 4 Mar 2020 09:46:13 +0000 (+0100)
Subject: BUG/MINOR: wdt: do not return an error when the watchdog couldn't be enabled
X-Git-Tag: v2.2-dev4~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7259fa2b89d20462f0222ac49d51575d20025e6b;p=thirdparty%2Fhaproxy.git

BUG/MINOR: wdt: do not return an error when the watchdog couldn't be enabled

On operating systems not supporting to create a timer on
POSIX_THREAD_CPUTIME we emit a warning but we return an error so the
process fails to start, which is absurd. Let's return a success once
the warning is emitted instead.

This may be backported to 2.1 and 2.0.
---

diff --git a/src/wdt.c b/src/wdt.c
index 8ccdb04054..0c405b9db4 100644
--- a/src/wdt.c
+++ b/src/wdt.c
@@ -156,7 +156,7 @@ int init_wdt_per_thread()
  fail1:
 	ti->wd_timer = TIMER_INVALID;
 	ha_warning("Failed to setup watchdog timer for thread %u, disabling lockup detection.\n", tid);
-	return 0;
+	return 1;
 }
 
 void deinit_wdt_per_thread()