From 13a1a4808935290dceb219daccd7aac3fda4e184 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 22 Feb 2019 15:09:33 +1100 Subject: [PATCH] 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 Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_recoverd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- 2.34.1