ctdb-locking: Talloc lock request from client specified context
[obnox/samba/samba-obnox.git] / ctdb / server / ctdb_freeze.c
index e39332e3859ab9478870f6ce8a5cc3584886a000..d68b0183ac41ca8f77ba2aaa085cbff62e465461 100644 (file)
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 #include "includes.h"
-#include "lib/events/events.h"
-#include "lib/tdb/include/tdb.h"
+#include "tdb.h"
 #include "system/network.h"
 #include "system/filesys.h"
 #include "system/wait.h"
 #include "../include/ctdb_private.h"
 #include "lib/util/dlinklist.h"
 #include "db_wrap.h"
-
-
-/*
-  lock all databases
- */
-static int ctdb_lock_all_databases(struct ctdb_context *ctdb)
-{
-       struct ctdb_db_context *ctdb_db;
-       for (ctdb_db=ctdb->db_list;ctdb_db;ctdb_db=ctdb_db->next) {
-               if (tdb_lockall(ctdb_db->ltdb->tdb) != 0) {
-                       return -1;
-               }
-       }
-       return 0;
-}
+#include "../common/rb_tree.h"
 
 /*
   a list of control requests waiting for a freeze lock child to get
@@ -49,17 +34,16 @@ struct ctdb_freeze_waiter {
        struct ctdb_freeze_waiter *next, *prev;
        struct ctdb_context *ctdb;
        struct ctdb_req_control *c;
+       uint32_t priority;
        int32_t status;
 };
 
 /* a handle to a freeze lock child process */
 struct ctdb_freeze_handle {
        struct ctdb_context *ctdb;
-       pid_t child;
-       int fd;
+       uint32_t priority;
+       struct lock_request *lreq;
        struct ctdb_freeze_waiter *waiters;
-       bool transaction_started;
-       uint32_t transaction_id;
 };
 
 /*
@@ -70,9 +54,14 @@ static int ctdb_freeze_handle_destructor(struct ctdb_freeze_handle *h)
        struct ctdb_context *ctdb = h->ctdb;
        struct ctdb_db_context *ctdb_db;
 
+       DEBUG(DEBUG_ERR,("Release freeze handler for prio %u\n", h->priority));
+
        /* cancel any pending transactions */
-       if (ctdb->freeze_handle && ctdb->freeze_handle->transaction_started) {
+       if (ctdb->freeze_transaction_started) {
                for (ctdb_db=ctdb->db_list;ctdb_db;ctdb_db=ctdb_db->next) {
+                       if (ctdb_db->priority != h->priority) {
+                               continue;
+                       }
                        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",
@@ -80,132 +69,48 @@ static int ctdb_freeze_handle_destructor(struct ctdb_freeze_handle *h)
                        }
                        tdb_remove_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK);
                }
-               ctdb->freeze_handle->transaction_started = false;
+               ctdb->freeze_transaction_started = false;
        }
 
-       ctdb->freeze_mode = CTDB_FREEZE_NONE;
-       ctdb->freeze_handle = NULL;
+       ctdb->freeze_mode[h->priority]    = CTDB_FREEZE_NONE;
+       ctdb->freeze_handles[h->priority] = NULL;
 
-       kill(h->child, SIGKILL);
        return 0;
 }
 
 /*
   called when the child writes its status to us
  */
-static void ctdb_freeze_lock_handler(struct event_context *ev, struct fd_event *fde, 
-                                      uint16_t flags, void *private_data)
+static void ctdb_freeze_lock_handler(void *private_data, bool locked)
 {
-       struct ctdb_freeze_handle *h = talloc_get_type(private_data, struct ctdb_freeze_handle);
-       int32_t status;
+       struct ctdb_freeze_handle *h = talloc_get_type_abort(private_data,
+                                                            struct ctdb_freeze_handle);
        struct ctdb_freeze_waiter *w;
 
-       if (h->ctdb->freeze_mode == CTDB_FREEZE_FROZEN) {
+       if (h->ctdb->freeze_mode[h->priority] == CTDB_FREEZE_FROZEN) {
                DEBUG(DEBUG_INFO,("freeze child died - unfreezing\n"));
-               if (h->ctdb->freeze_handle == h) {
-                       h->ctdb->freeze_handle = NULL;
-               }
                talloc_free(h);
                return;
        }
 
-       if (read(h->fd, &status, sizeof(status)) != sizeof(status)) {
-               DEBUG(DEBUG_ERR,("read error from freeze lock child\n"));
-               status = -1;
-       }
-
-       if (status == -1) {
+       if (!locked) {
                DEBUG(DEBUG_ERR,("Failed to get locks in ctdb_freeze_child\n"));
                /* we didn't get the locks - destroy the handle */
                talloc_free(h);
                return;
        }
 
-       h->ctdb->freeze_mode = CTDB_FREEZE_FROZEN;
+       h->ctdb->freeze_mode[h->priority] = CTDB_FREEZE_FROZEN;
 
        /* notify the waiters */
-       while ((w = h->ctdb->freeze_handle->waiters)) {
-               w->status = status;
-               DLIST_REMOVE(h->ctdb->freeze_handle->waiters, w);
-               talloc_free(w);
+       if (h != h->ctdb->freeze_handles[h->priority]) {
+               DEBUG(DEBUG_ERR,("lockwait finished but h is not linked\n"));
        }
-}
-
-/*
-  create a child which gets locks on all the open databases, then calls the callback telling the parent
-  that it is done
- */
-static struct ctdb_freeze_handle *ctdb_freeze_lock(struct ctdb_context *ctdb)
-{
-       struct ctdb_freeze_handle *h;
-       int fd[2];
-       struct fd_event *fde;
-
-       h = talloc_zero(ctdb, struct ctdb_freeze_handle);
-       CTDB_NO_MEMORY_NULL(ctdb, h);
-
-       h->ctdb = ctdb;
-
-       /* use socketpair() instead of pipe() so we have bi-directional fds */
-       if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != 0) {
-               DEBUG(DEBUG_ERR,("Failed to create pipe for ctdb_freeze_lock\n"));
-               talloc_free(h);
-               return NULL;
-       }
-       
-       h->child = fork();
-       if (h->child == -1) {
-               DEBUG(DEBUG_ERR,("Failed to fork child for ctdb_freeze_lock\n"));
-               talloc_free(h);
-               return NULL;
-       }
-
-       if (h->child == 0) {
-               int ret;
-               int count = 0;
-               /* in the child */
-               close(fd[0]);
-               ret = ctdb_lock_all_databases(ctdb);
-               if (ret != 0) {
-                       _exit(0);
-               }
-
-               alarm(30);
-
-               while (count++ < 30) {
-                       ret = write(fd[1], &ret, sizeof(ret));
-                       if (ret == sizeof(ret)) {
-                               break;
-                       }
-                       DEBUG(DEBUG_ERR, (__location__ " Failed to write to socket from freeze child. ret:%d errno:%u\n", ret, errno));
-                       sleep (1);
-               }
-               if (count >= 30) {
-                       DEBUG(DEBUG_ERR, (__location__ " Failed to write to socket from freeze child. Aborting freeze child\n"));
-                       _exit(0);
-               }
-
-               /* the read here means we will die if the parent exits */
-               read(fd[1], &ret, sizeof(ret));
-               _exit(0);
-       }
-
-       talloc_set_destructor(h, ctdb_freeze_handle_destructor);
-
-       close(fd[1]);
-
-       h->fd = fd[0];
-
-       fde = event_add_fd(ctdb->ev, h, h->fd, EVENT_FD_READ|EVENT_FD_AUTOCLOSE, 
-                          ctdb_freeze_lock_handler, h);
-       if (fde == NULL) {
-               DEBUG(DEBUG_ERR,("Failed to setup fd event for ctdb_freeze_lock\n"));
-               close(fd[0]);
-               talloc_free(h);
-               return NULL;
+       while ((w = h->waiters)) {
+               w->status = 0;
+               DLIST_REMOVE(h->waiters, w);
+               talloc_free(w);
        }
-
-       return h;
 }
 
 /*
@@ -213,26 +118,45 @@ static struct ctdb_freeze_handle *ctdb_freeze_lock(struct ctdb_context *ctdb)
  */
 static int ctdb_freeze_waiter_destructor(struct ctdb_freeze_waiter *w)
 {
-       DLIST_REMOVE(w->ctdb->freeze_handle->waiters, w);
        ctdb_request_control_reply(w->ctdb, w->c, NULL, w->status, NULL);
        return 0;
 }
 
 /*
-  start the freeze process
+  start the freeze process for a certain priority
  */
-void ctdb_start_freeze(struct ctdb_context *ctdb)
+void ctdb_start_freeze(struct ctdb_context *ctdb, uint32_t priority)
 {
-       if (ctdb->freeze_mode == CTDB_FREEZE_FROZEN) {
+       struct ctdb_freeze_handle *h;
+
+       if ((priority < 1) || (priority > NUM_DB_PRIORITIES)) {
+               DEBUG(DEBUG_ERR,(__location__ " Invalid db priority : %u\n", priority));
+               ctdb_fatal(ctdb, "Internal error");
+       }
+
+       if (ctdb->freeze_mode[priority] == CTDB_FREEZE_FROZEN) {
                /* we're already frozen */
                return;
        }
 
+       DEBUG(DEBUG_ERR, ("Freeze priority %u\n", priority));
+
+       /* Stop any vacuuming going on: we don't want to wait. */
+       ctdb_stop_vacuuming(ctdb);
+
        /* if there isn't a freeze lock child then create one */
-       if (!ctdb->freeze_handle) {
-               ctdb->freeze_handle = ctdb_freeze_lock(ctdb);
-               CTDB_NO_MEMORY_VOID(ctdb, ctdb->freeze_handle);
-               ctdb->freeze_mode = CTDB_FREEZE_PENDING;
+       if (ctdb->freeze_handles[priority] == NULL) {
+               h = talloc_zero(ctdb, struct ctdb_freeze_handle);
+               CTDB_NO_MEMORY_FATAL(ctdb, h);
+               h->ctdb = ctdb;
+               h->priority = priority;
+               talloc_set_destructor(h, ctdb_freeze_handle_destructor);
+
+               h->lreq = ctdb_lock_alldb_prio(h, ctdb, priority, false,
+                                              ctdb_freeze_lock_handler, h);
+               CTDB_NO_MEMORY_FATAL(ctdb, h->lreq);
+               ctdb->freeze_handles[priority] = h;
+               ctdb->freeze_mode[priority] = CTDB_FREEZE_PENDING;
        }
 }
 
@@ -242,25 +166,45 @@ void ctdb_start_freeze(struct ctdb_context *ctdb)
 int32_t ctdb_control_freeze(struct ctdb_context *ctdb, struct ctdb_req_control *c, bool *async_reply)
 {
        struct ctdb_freeze_waiter *w;
+       uint32_t priority;
+
+       priority = (uint32_t)c->srvid;
+
+       if (priority == 0) {
+               DEBUG(DEBUG_ERR,("Freeze priority 0 requested, remapping to priority 1\n"));
+               priority = 1;
+       }
 
-       if (ctdb->freeze_mode == CTDB_FREEZE_FROZEN) {
+       if ((priority < 1) || (priority > NUM_DB_PRIORITIES)) {
+               DEBUG(DEBUG_ERR,(__location__ " Invalid db priority : %u\n", priority));
+               return -1;
+       }
+
+       if (ctdb->freeze_mode[priority] == CTDB_FREEZE_FROZEN) {
+               DEBUG(DEBUG_ERR, ("Freeze priority %u\n", priority));
                /* we're already frozen */
                return 0;
        }
 
-       ctdb_start_freeze(ctdb);
+       ctdb_start_freeze(ctdb, priority);
 
        /* add ourselves to list of waiters */
-       w = talloc(ctdb->freeze_handle, struct ctdb_freeze_waiter);
+       if (ctdb->freeze_handles[priority] == NULL) {
+               DEBUG(DEBUG_ERR,("No freeze lock handle when adding a waiter\n"));
+               return -1;
+       }
+
+       w = talloc(ctdb->freeze_handles[priority], struct ctdb_freeze_waiter);
        CTDB_NO_MEMORY(ctdb, w);
-       w->ctdb   = ctdb;
-       w->c      = talloc_steal(w, c);
-       w->status = -1;
+       w->ctdb     = ctdb;
+       w->c        = talloc_steal(w, c);
+       w->priority = priority;
+       w->status   = -1;
        talloc_set_destructor(w, ctdb_freeze_waiter_destructor);
-       DLIST_ADD(ctdb->freeze_handle->waiters, w);
+       DLIST_ADD(ctdb->freeze_handles[priority]->waiters, w);
 
        /* we won't reply till later */
-       *async_reply = True;
+       *async_reply = true;
        return 0;
 }
 
@@ -270,25 +214,27 @@ int32_t ctdb_control_freeze(struct ctdb_context *ctdb, struct ctdb_req_control *
  */
 bool ctdb_blocking_freeze(struct ctdb_context *ctdb)
 {
-       ctdb_start_freeze(ctdb);
+       int i;
+
+       for (i=1; i<=NUM_DB_PRIORITIES; i++) {
+               ctdb_start_freeze(ctdb, i);
 
-       /* block until frozen */
-       while (ctdb->freeze_mode == CTDB_FREEZE_PENDING) {
-               event_loop_once(ctdb->ev);
+               /* block until frozen */
+               while (ctdb->freeze_mode[i] == CTDB_FREEZE_PENDING) {
+                       event_loop_once(ctdb->ev);
+               }
        }
 
-       return ctdb->freeze_mode == CTDB_FREEZE_FROZEN;
+       return true;
 }
 
 
-
-/*
-  thaw the databases
- */
-int32_t ctdb_control_thaw(struct ctdb_context *ctdb)
+static void thaw_priority(struct ctdb_context *ctdb, uint32_t priority)
 {
+       DEBUG(DEBUG_ERR,("Thawing priority %u\n", priority));
+
        /* cancel any pending transactions */
-       if (ctdb->freeze_handle && ctdb->freeze_handle->transaction_started) {
+       if (ctdb->freeze_transaction_started) {
                struct ctdb_db_context *ctdb_db;
 
                for (ctdb_db=ctdb->db_list;ctdb_db;ctdb_db=ctdb_db->next) {
@@ -300,6 +246,7 @@ int32_t ctdb_control_thaw(struct ctdb_context *ctdb)
                        tdb_remove_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK);
                }
        }
+       ctdb->freeze_transaction_started = false;
 
 #if 0
        /* this hack can be used to get a copy of the databases at the end of a recovery */
@@ -311,9 +258,39 @@ int32_t ctdb_control_thaw(struct ctdb_context *ctdb)
        system("mkdir -p test.db.saved; /usr/bin/rsync --delete -a test.db/ test.db.saved/$$ 2>&1 > /dev/null");
 #endif
 
+       if (ctdb->freeze_handles[priority] != NULL) {
+               talloc_free(ctdb->freeze_handles[priority]);
+               ctdb->freeze_handles[priority] = NULL;
+       }
+}
+
+/*
+  thaw the databases
+ */
+int32_t ctdb_control_thaw(struct ctdb_context *ctdb, uint32_t priority,
+                         bool check_recmode)
+{
+       if (priority > NUM_DB_PRIORITIES) {
+               DEBUG(DEBUG_ERR,(__location__ " Invalid db priority : %u\n",
+                                priority));
+               return -1;
+       }
+
+       if (check_recmode && ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE) {
+               DEBUG(DEBUG_ERR, ("Failing to thaw databases while "
+                                 "recovery is active\n"));
+               return -1;
+       }
+
+       if (priority == 0) {
+               int i;
+               for (i=1;i<=NUM_DB_PRIORITIES; i++) {
+                       thaw_priority(ctdb, i);
+               }
+       } else {
+               thaw_priority(ctdb, priority);
+       }
 
-       talloc_free(ctdb->freeze_handle);
-       ctdb->freeze_handle = NULL;
        ctdb_call_resend_all(ctdb);
        return 0;
 }
@@ -325,19 +302,21 @@ int32_t ctdb_control_thaw(struct ctdb_context *ctdb)
 int32_t ctdb_control_transaction_start(struct ctdb_context *ctdb, uint32_t id)
 {
        struct ctdb_db_context *ctdb_db;
+       int i;
 
-       if (ctdb->freeze_mode != CTDB_FREEZE_FROZEN) {
-               DEBUG(DEBUG_ERR,(__location__ " Failed transaction_start while not frozen\n"));
-               return -1;
+       for (i=1;i<=NUM_DB_PRIORITIES; i++) {
+               if (ctdb->freeze_mode[i] != CTDB_FREEZE_FROZEN) {
+                       DEBUG(DEBUG_ERR,(__location__ " Failed transaction_start while not frozen\n"));
+                       return -1;
+               }
        }
 
-
        for (ctdb_db=ctdb->db_list;ctdb_db;ctdb_db=ctdb_db->next) {
                int ret;
 
                tdb_add_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK);
 
-               if (ctdb->freeze_handle->transaction_started) {
+               if (ctdb->freeze_transaction_started) {
                        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));
@@ -356,8 +335,33 @@ int32_t ctdb_control_transaction_start(struct ctdb_context *ctdb, uint32_t id)
                }
        }
 
-       ctdb->freeze_handle->transaction_started = true;
-       ctdb->freeze_handle->transaction_id = id;
+       ctdb->freeze_transaction_started = true;
+       ctdb->freeze_transaction_id = id;
+
+       return 0;
+}
+
+/*
+  cancel a transaction for all databases - used for recovery
+ */
+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->freeze_transaction_started = false;
 
        return 0;
 }
@@ -368,48 +372,75 @@ int32_t ctdb_control_transaction_start(struct ctdb_context *ctdb, uint32_t id)
 int32_t ctdb_control_transaction_commit(struct ctdb_context *ctdb, uint32_t id)
 {
        struct ctdb_db_context *ctdb_db;
+       int i;
+       int healthy_nodes = 0;
 
-       if (ctdb->freeze_mode != CTDB_FREEZE_FROZEN) {
-               DEBUG(DEBUG_ERR,(__location__ " Failed transaction_start while not frozen\n"));
-               return -1;
+       for (i=1;i<=NUM_DB_PRIORITIES; i++) {
+               if (ctdb->freeze_mode[i] != CTDB_FREEZE_FROZEN) {
+                       DEBUG(DEBUG_ERR,(__location__ " Failed transaction_start while not frozen\n"));
+                       return -1;
+               }
        }
 
-       if (!ctdb->freeze_handle->transaction_started) {
+       if (!ctdb->freeze_transaction_started) {
                DEBUG(DEBUG_ERR,(__location__ " transaction not started\n"));
                return -1;
        }
 
-       if (id != ctdb->freeze_handle->transaction_id) {
+       if (id != ctdb->freeze_transaction_id) {
                DEBUG(DEBUG_ERR,(__location__ " incorrect transaction id 0x%x in commit\n", id));
                return -1;
        }
 
+       DEBUG(DEBUG_DEBUG,(__location__ " num_nodes[%d]\n", ctdb->num_nodes));
+       for (i=0; i < ctdb->num_nodes; i++) {
+               DEBUG(DEBUG_DEBUG,(__location__ " node[%d].flags[0x%X]\n",
+                                  i, ctdb->nodes[i]->flags));
+               if (ctdb->nodes[i]->flags == 0) {
+                       healthy_nodes++;
+               }
+       }
+       DEBUG(DEBUG_INFO,(__location__ " healthy_nodes[%d]\n", healthy_nodes));
+
        for (ctdb_db=ctdb->db_list;ctdb_db;ctdb_db=ctdb_db->next) {
+               int ret;
+
                tdb_add_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK);
-               if (tdb_transaction_commit(ctdb_db->ltdb->tdb) != 0) {
+               ret = tdb_transaction_commit(ctdb_db->ltdb->tdb);
+               if (ret != 0) {
                        DEBUG(DEBUG_ERR,(__location__ " Failed to commit transaction for db '%s'. Cancel all transactions and resetting transaction_started to false.\n",
                                 ctdb_db->db_name));
-
-                       /* 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->freeze_handle->transaction_started = false;
-
-                       return -1;
+                       goto fail;
                }
                tdb_remove_flags(ctdb_db->ltdb->tdb, TDB_NOLOCK);
+
+               ret = ctdb_update_persistent_health(ctdb, ctdb_db, NULL, healthy_nodes);
+               if (ret != 0) {
+                       DEBUG(DEBUG_CRIT,(__location__ " Failed to update persistent health for db '%s'. "
+                                        "Cancel all remaining transactions and resetting transaction_started to false.\n",
+                                        ctdb_db->db_name));
+                       goto fail;
+               }
        }
 
-       ctdb->freeze_handle->transaction_started = false;
-       ctdb->freeze_handle->transaction_id = 0;
+       ctdb->freeze_transaction_started = false;
+       ctdb->freeze_transaction_id = 0;
 
        return 0;
+
+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->freeze_transaction_started = false;
+
+       return -1;
 }
 
 /*
@@ -420,24 +451,24 @@ int32_t ctdb_control_wipe_database(struct ctdb_context *ctdb, TDB_DATA indata)
        struct ctdb_control_wipe_database w = *(struct ctdb_control_wipe_database *)indata.dptr;
        struct ctdb_db_context *ctdb_db;
 
-       if (ctdb->freeze_mode != CTDB_FREEZE_FROZEN) {
-               DEBUG(DEBUG_ERR,(__location__ " Failed transaction_start while not frozen\n"));
+       ctdb_db = find_ctdb_db(ctdb, w.db_id);
+       if (!ctdb_db) {
+               DEBUG(DEBUG_ERR,(__location__ " Unknown db 0x%x\n", w.db_id));
                return -1;
        }
 
-       if (!ctdb->freeze_handle->transaction_started) {
-               DEBUG(DEBUG_ERR,(__location__ " transaction not started\n"));
+       if (ctdb->freeze_mode[ctdb_db->priority] != CTDB_FREEZE_FROZEN) {
+               DEBUG(DEBUG_ERR,(__location__ " Failed transaction_start while not frozen\n"));
                return -1;
        }
 
-       if (w.transaction_id != ctdb->freeze_handle->transaction_id) {
-               DEBUG(DEBUG_ERR,(__location__ " incorrect transaction id 0x%x in commit\n", w.transaction_id));
+       if (!ctdb->freeze_transaction_started) {
+               DEBUG(DEBUG_ERR,(__location__ " transaction not started\n"));
                return -1;
        }
 
-       ctdb_db = find_ctdb_db(ctdb, w.db_id);
-       if (!ctdb_db) {
-               DEBUG(DEBUG_ERR,(__location__ " Unknown db 0x%x\n", w.db_id));
+       if (w.transaction_id != ctdb->freeze_transaction_id) {
+               DEBUG(DEBUG_ERR,(__location__ " incorrect transaction id 0x%x in commit\n", w.transaction_id));
                return -1;
        }
 
@@ -447,5 +478,15 @@ int32_t ctdb_control_wipe_database(struct ctdb_context *ctdb, TDB_DATA indata)
                return -1;
        }
 
+       if (!ctdb_db->persistent) {
+               talloc_free(ctdb_db->delete_queue);
+               ctdb_db->delete_queue = trbt_create(ctdb_db, 0);
+               if (ctdb_db->delete_queue == NULL) {
+                       DEBUG(DEBUG_ERR, (__location__ " Failed to re-create "
+                                         "the vacuum tree.\n"));
+                       return -1;
+               }
+       }
+
        return 0;
 }