From 7e5a8a4884ea87bb985fe0e2b65ff130fc2ba8aa Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Wed, 26 Feb 2020 11:50:09 +1100 Subject: [PATCH] ctdb-daemon: Respect CTDB_CTRL_FLAG_ATTACH_RECOVERY when attaching databases This is currently only set by the recovery daemon when it attaches missing databases, so there is no obvious behaviour change. However, attaching missing databases can now be moved to the recovery helper as long as it sets this flag. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14294 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_ltdb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c index a6709ff72de..e050b7304fe 100644 --- a/ctdb/server/ctdb_ltdb_server.c +++ b/ctdb/server/ctdb_ltdb_server.c @@ -1135,7 +1135,7 @@ int32_t ctdb_control_db_attach(struct ctdb_context *ctdb, return -1; } - if (client->pid != ctdb->recoverd_pid && + if (!(c->flags & CTDB_CTRL_FLAG_ATTACH_RECOVERY) && (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE || ctdb->runstate < CTDB_RUNSTATE_STARTUP)) { struct ctdb_deferred_attach_context *da_ctx = talloc(client, struct ctdb_deferred_attach_context); -- 2.47.3