ctdb-freeze: Use database specific information in wipe database
authorAmitay Isaacs <amitay@gmail.com>
Tue, 15 Sep 2015 04:16:21 +0000 (14:16 +1000)
committerAmitay Isaacs <amitay@samba.org>
Wed, 7 Oct 2015 12:53:27 +0000 (14:53 +0200)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
ctdb/server/ctdb_freeze.c

index 2d5f07bdac85a5e1af7ca482aa82d1229051f52c..d90444a9db9ca4c85bee4e8b8b85bf23a1f763db 100644 (file)
@@ -907,17 +907,17 @@ int32_t ctdb_control_wipe_database(struct ctdb_context *ctdb, TDB_DATA indata)
                return -1;
        }
 
-       if (ctdb->freeze_mode[ctdb_db->priority] != CTDB_FREEZE_FROZEN) {
+       if (ctdb_db->freeze_mode != CTDB_FREEZE_FROZEN) {
                DEBUG(DEBUG_ERR,(__location__ " Failed transaction_start while not frozen\n"));
                return -1;
        }
 
-       if (!ctdb->freeze_transaction_started) {
+       if (!ctdb_db->freeze_transaction_started) {
                DEBUG(DEBUG_ERR,(__location__ " transaction not started\n"));
                return -1;
        }
 
-       if (w.transaction_id != ctdb->freeze_transaction_id) {
+       if (w.transaction_id != ctdb_db->freeze_transaction_id) {
                DEBUG(DEBUG_ERR,(__location__ " incorrect transaction id 0x%x in commit\n", w.transaction_id));
                return -1;
        }