diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2016-07-21 13:16:53 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2016-07-25 21:29:42 +0200 |
| commit | 5944a9bbcb17f345c56bd0dd170abf6dda03c83a (patch) | |
| tree | fa37340f4838a475bf3edb4b6c0e89e3af43a9ee /ctdb/server | |
| parent | 79b6b4b621eea131472ab645e9ada7cc2f732124 (diff) | |
| download | samba-5944a9bbcb17f345c56bd0dd170abf6dda03c83a.tar.gz | |
ctdb-freeze: Drop function thaw_priority()
There are no database priorities anymore, so the function name does
not make any sense. Call the code in thaw_priority() directly from
ctdb_control_thaw().
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_freeze.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c index 27cb637068a..ec53ac5b63f 100644 --- a/ctdb/server/ctdb_freeze.c +++ b/ctdb/server/ctdb_freeze.c @@ -605,21 +605,6 @@ bool ctdb_blocking_freeze(struct ctdb_context *ctdb) return true; } - -static void thaw_priority(struct ctdb_context *ctdb) -{ - DEBUG(DEBUG_ERR,("Thawing all\n")); - - /* cancel any pending transactions */ - if (ctdb->freeze_transaction_started) { - ctdb_db_iterator(ctdb, db_transaction_cancel_handler, NULL); - ctdb->freeze_transaction_started = false; - } - - ctdb_db_iterator(ctdb, db_thaw, NULL); - TALLOC_FREE(ctdb->freeze_handle); -} - /* thaw the databases */ @@ -631,7 +616,16 @@ int32_t ctdb_control_thaw(struct ctdb_context *ctdb, bool check_recmode) return -1; } - thaw_priority(ctdb); + DEBUG(DEBUG_ERR,("Thawing all\n")); + + /* cancel any pending transactions */ + if (ctdb->freeze_transaction_started) { + ctdb_db_iterator(ctdb, db_transaction_cancel_handler, NULL); + ctdb->freeze_transaction_started = false; + } + + ctdb_db_iterator(ctdb, db_thaw, NULL); + TALLOC_FREE(ctdb->freeze_handle); ctdb_call_resend_all(ctdb); return 0; |