ctdb-recoverd: Ban node on unknown error when taking recovery lock

We really shouldn't see unknown errors.  They probably represent a
misconfigured recovery lock or similar.

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 45a77d65b2e39b4af94da4ab99575f4ee08a7ebd)

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 560e632d028693051bfdf32220513ccb3223cab1..47ccda15a1a8196b93690ee79c46a2aa0f17c41d 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -923,6 +923,17 @@ static void take_reclock_handler(char status,
 
        default:
                D_ERR("Unable to take recover lock - unknown error\n");
+
+               {
+                       struct ctdb_recoverd *rec = s->rec;
+                       struct ctdb_context *ctdb = rec->ctdb;
+                       uint32_t pnn = ctdb_get_pnn(ctdb);
+
+                       D_ERR("Banning this node\n");
+                       ctdb_ban_node(rec,
+                                     pnn,
+                                     ctdb->tunable.recovery_ban_period);
+               }
        }
 
        s->done = true;