diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-08-05 17:02:07 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-10-07 14:53:26 +0200 |
| commit | 457618888a80d3f5733a9e3dd41d3ab64ace4ae5 (patch) | |
| tree | 2a94ac6eabdd5f763a967b9b97b04d7e63138008 /ctdb/server/ctdb_freeze.c | |
| parent | 74f7eebc7911a4ec5f6ee68266b027a661579c68 (diff) | |
| download | samba-457618888a80d3f5733a9e3dd41d3ab64ace4ae5.tar.gz | |
ctdb-freeze: Use ctdb_db_iterator to cancel transaction on databases
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/server/ctdb_freeze.c')
| -rw-r--r-- | ctdb/server/ctdb_freeze.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/ctdb/server/ctdb_freeze.c b/ctdb/server/ctdb_freeze.c index 002f14856c1..5c20253f0a8 100644 --- a/ctdb/server/ctdb_freeze.c +++ b/ctdb/server/ctdb_freeze.c @@ -341,21 +341,9 @@ int32_t ctdb_control_transaction_start(struct ctdb_context *ctdb, uint32_t id) */ int32_t ctdb_control_transaction_cancel(struct ctdb_context *ctdb) { - struct ctdb_db_context *ctdb_db; - DEBUG(DEBUG_ERR,(__location__ " recovery transaction cancelled called\n")); - for (ctdb_db=ctdb->db_list;ctdb_db;ctdb_db=ctdb_db->next) { - tdb_add_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK); - - if (tdb_transaction_cancel(ctdb_db->ltdb->tdb) != 0) { - DEBUG(DEBUG_ERR,(__location__ " Failed to cancel transaction for db '%s'\n", ctdb_db->db_name)); - /* not a fatal error */ - } - - tdb_remove_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK); - } - + ctdb_db_iterator(ctdb, db_transaction_cancel_handler, NULL); ctdb->freeze_transaction_started = false; return 0; @@ -425,14 +413,7 @@ int32_t ctdb_control_transaction_commit(struct ctdb_context *ctdb, uint32_t id) fail: /* cancel any pending transactions */ - for (ctdb_db=ctdb->db_list;ctdb_db;ctdb_db=ctdb_db->next) { - tdb_add_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK); - if (tdb_transaction_cancel(ctdb_db->ltdb->tdb) != 0) { - DEBUG(DEBUG_ERR,(__location__ " Failed to cancel transaction for db '%s'\n", - ctdb_db->db_name)); - } - tdb_remove_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK); - } + ctdb_db_iterator(ctdb, db_transaction_cancel_handler, NULL); ctdb->freeze_transaction_started = false; return -1; |