vacuum: run the fast vacuum after the db traverse

This in preparation of modifying the db traverse to
fill the delete_queue that is processed by the fast
vacuum run, instead of filling the same lists as the
fast vacuum run for further processing.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(Imported from commit d0b7b3882511769b1bfc1d0d4fdc0dba288e6ccd)

diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 889b5b4b39b8805ca5fc474067f41d9b8120db70..ff607f30e67af46378b82459aefb77209294657d 100644 (file)
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -1273,8 +1273,6 @@ static int ctdb_vacuum_db(struct ctdb_db_context *ctdb_db,
                return ret;
        }
 
-       ctdb_vacuum_db_fast(ctdb_db, vdata);
-
        if (full_vacuum_run) {
                ret = ctdb_vacuum_db_full(ctdb_db, vdata);
                if (ret != 0) {
@@ -1282,6 +1280,8 @@ static int ctdb_vacuum_db(struct ctdb_db_context *ctdb_db,
                }
        }
 
+       ctdb_vacuum_db_fast(ctdb_db, vdata);
+
        ret = ctdb_process_vacuum_fetch_lists(ctdb_db, vdata);
        if (ret != 0) {
                return ret;