diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-02-22 15:09:33 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-03-04 10:37:54 +0000 |
| commit | 65c3c5801ff47ce48a7061f47c00bcd61c7c3c1e (patch) | |
| tree | 1fb05af4fdfe8ec974e39bf06d615d2f753101ec | |
| parent | 4c059e03ef75085c47c8ec15025655b0efdf8460 (diff) | |
| download | samba-65c3c5801ff47ce48a7061f47c00bcd61c7c3c1e.tar.gz | |
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>
(cherry picked from commit 13a1a4808935290dceb219daccd7aac3fda4e184)
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 47ccda15a1a..469fd21b463 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -972,7 +972,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, |