diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2016-07-19 16:32:16 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2016-07-25 21:29:42 +0200 |
| commit | 79b6b4b621eea131472ab645e9ada7cc2f732124 (patch) | |
| tree | 3d3e402fbbcef09e8974e4c5758bc23ba896d39b /ctdb/include | |
| parent | 9338443a92f6310bca64fefdd1a174e29e5146f5 (diff) | |
| download | samba-79b6b4b621eea131472ab645e9ada7cc2f732124.tar.gz | |
ctdb-daemon: Drop priorites from freeze/thaw code
Parallel database recovery freezes databases in parallel and irrespective
of database priority. So drop priority from freeze/thaw code.
Database priority will be dropped completely soon.
Now FREEZE and THAW controls operate on all the databases.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/include')
| -rw-r--r-- | ctdb/include/ctdb_private.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index f7982de10fd..f2f5acf3342 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -296,8 +296,8 @@ struct ctdb_context { TALLOC_CTX *keepalive_ctx; TALLOC_CTX *check_public_ifaces_ctx; struct ctdb_tunable_list tunable; - enum ctdb_freeze_mode freeze_mode[NUM_DB_PRIORITIES+1]; - struct ctdb_freeze_handle *freeze_handles[NUM_DB_PRIORITIES+1]; + enum ctdb_freeze_mode freeze_mode; + struct ctdb_freeze_handle *freeze_handle; bool freeze_transaction_started; uint32_t freeze_transaction_id; ctdb_sock_addr *address; @@ -658,8 +658,7 @@ int32_t ctdb_control_db_thaw(struct ctdb_context *ctdb, uint32_t db_id); int32_t ctdb_control_freeze(struct ctdb_context *ctdb, struct ctdb_req_control_old *c, bool *async_reply); -int32_t ctdb_control_thaw(struct ctdb_context *ctdb, uint32_t priority, - bool check_recmode); +int32_t ctdb_control_thaw(struct ctdb_context *ctdb, bool check_recmode); bool ctdb_blocking_freeze(struct ctdb_context *ctdb); |