diff options
| author | Martin Schwenke <martin@meltin.net> | 2020-02-21 11:13:05 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-03-30 10:08:25 +0000 |
| commit | 835f091f80af8d4264b5b9d008f809c845f48bd6 (patch) | |
| tree | cd5b494769cb43efafad595068d0bc44bbcade5e /ctdb | |
| parent | c42aec419ff97a842fe580c2e9c91eeb333b1828 (diff) | |
| download | samba-835f091f80af8d4264b5b9d008f809c845f48bd6.tar.gz | |
ctdb-recovery: Use CTDB_CTRL_FLAG_ATTACH_RECOVERY to attach during recovery
ctdb_ctrl_createdb() is only called by the recovery daemon, so this is
a safe, temporary change. This is temporary because
ctdb_ctrl_createdb(), create_missing_remote_databases() and
create_missing_local_databases() will all go away soon.
Note that this doesn't cause a change in behaviour. The main daemon
will still only defer attaches from non-recoverd processes during
recovery.
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 98e3d0db2bc5f33217e26fab1dfb4bb91eae534f)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_client.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_client.c b/ctdb/server/ctdb_client.c index 4c67990c0b5..26055698568 100644 --- a/ctdb/server/ctdb_client.c +++ b/ctdb/server/ctdb_client.c @@ -1160,8 +1160,17 @@ int ctdb_ctrl_createdb(struct ctdb_context *ctdb, struct timeval timeout, opcode = CTDB_CONTROL_DB_ATTACH; } - ret = ctdb_control(ctdb, destnode, 0, opcode, 0, data, - mem_ctx, &data, &res, &timeout, NULL); + ret = ctdb_control(ctdb, + destnode, + 0, + opcode, + CTDB_CTRL_FLAG_ATTACH_RECOVERY, + data, + mem_ctx, + &data, + &res, + &timeout, + NULL); if (ret != 0 || res != 0) { return -1; |