ctdb-daemon: Respect CTDB_CTRL_FLAG_ATTACH_RECOVERY when attaching databases

[vlendec/samba-autobuild/.git] / ctdb / server / ctdb_ltdb_server.c

diff --git a/ctdb/server/ctdb_ltdb_server.c b/ctdb/server/ctdb_ltdb_server.c
index a6709ff72de967854e5b16828568fb630304a975..e050b7304fe5f5a04320035a474683b43ebe0fb7 100644 (file)
--- 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);