diff options
| author | Martin Schwenke <martin@meltin.net> | 2020-02-26 11:50:09 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-03-30 10:08:25 +0000 |
| commit | 92b0fcf3a4ef1eab39c12ed289af0a8fddaf8165 (patch) | |
| tree | 6fcca1c816d0a9385618632796391de4ff265159 /ctdb | |
| parent | 835f091f80af8d4264b5b9d008f809c845f48bd6 (diff) | |
| download | samba-92b0fcf3a4ef1eab39c12ed289af0a8fddaf8165.tar.gz | |
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 <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 7e5a8a4884ea87bb985fe0e2b65ff130fc2ba8aa)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_ltdb_server.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |