From 3cbffa925059facfc9af6643f6db08f10c605c83 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 30 Aug 2010 18:25:28 +0200 Subject: [PATCH] server/recoverd: if we can't get the recovery lock, ban ourself metze --- server/ctdb_recoverd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c index 4df6ce03..30c34b3a 100644 --- a/server/ctdb_recoverd.c +++ b/server/ctdb_recoverd.c @@ -1382,8 +1382,10 @@ static int do_recovery(struct ctdb_recoverd *rec, DEBUG(DEBUG_ERR,("Taking out recovery lock from recovery daemon\n")); start_time = timeval_current(); if (!ctdb_recovery_lock(ctdb, true)) { - ctdb_set_culprit(rec, pnn); - DEBUG(DEBUG_ERR,("Unable to get recovery lock - aborting recovery\n")); + DEBUG(DEBUG_ERR,("Unable to get recovery lock - aborting recovery " + "and ban ourself for %u seconds\n", + ctdb->tunable.recovery_ban_period)); + ctdb_ban_node(rec, pnn, ctdb->tunable.recovery_ban_period); return -1; } ctdb_ctrl_report_recd_lock_latency(ctdb, CONTROL_TIMEOUT(), timeval_elapsed(&start_time)); -- 2.34.1