From: Martin Schwenke <martin@meltin.net>
Date: Fri, 22 Feb 2019 04:09:33 +0000 (+1100)
Subject: ctdb-recoverd: Time out attempt to take recovery lock after 120s
X-Git-Tag: ldb-1.6.1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13a1a4808935290dceb219daccd7aac3fda4e184;p=thirdparty%2Fsamba.git

ctdb-recoverd: Time out attempt to take recovery lock after 120s

Currently this will wait forever.  It really needs a timeout in case
the cluster filesystem (or other lock mechanism) is completely wedged.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13800

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 584d65d61a7..9b3559b2a92 100644
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -971,7 +971,7 @@ static bool ctdb_recovery_lock(struct ctdb_recoverd *rec)
 	h = ctdb_cluster_mutex(s,
 			       ctdb,
 			       ctdb->recovery_lock,
-			       0,
+			       120,
 			       take_reclock_handler,
 			       s,
 			       lost_reclock_handler,