Merge commit 'rusty/vacuum-fix-master'

diff --cc include/ctdb_private.h
Simple merge

diff --cc server/ctdb_freeze.c
Simple merge

diff --cc server/ctdb_vacuum.c
index 9ec8b31d968934c6cb54101a4b3b469c578a4f33,ec1da3d97b5c034e45b8266a51f6152cf7fa4427..98110148e080ddf87a44e76c23dce0dde286d422
--- 1/server/ctdb_vacuum.c
--- 2/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@@ -801,11 -806,16 +806,17 @@@ ctdb_vacuum_event(struct event_context 
        struct ctdb_db_context *ctdb_db = vacuum_handle->ctdb_db;
        struct ctdb_context *ctdb = ctdb_db->ctdb;
        struct ctdb_vacuum_child_context *child_ctx;
 +      struct tevent_fd *fde;
        int ret;
  
-       /* we dont vacuum if we are in recovery mode */
-       if (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE) {
+       /* we dont vacuum if we are in recovery mode, or db frozen */
+       if (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE ||
+           ctdb->freeze_mode[ctdb_db->priority] != CTDB_FREEZE_NONE) {
+               DEBUG(DEBUG_INFO, ("Not vacuuming %s (%s)\n", ctdb_db->db_name,
+                                  ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE ? "in recovery"
+                                  : ctdb->freeze_mode[ctdb_db->priority] == CTDB_FREEZE_PENDING
+                                  ? "freeze pending"
+                                  : "frozen"));
                event_add_timed(ctdb->ev, vacuum_handle, timeval_current_ofs(ctdb->tunable.vacuum_default_interval, 0), ctdb_vacuum_event, vacuum_handle);
                return;
        }