summaryrefslogtreecommitdiffstats
path: root/ctdb/server/ctdb_vacuum.c
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2014-02-14 18:27:14 +0100
committerAmitay Isaacs <amitay@gmail.com>2014-03-06 11:31:12 +1100
commitd0b7b3882511769b1bfc1d0d4fdc0dba288e6ccd (patch)
treeb8bac1e5573b2296a622546e6c5d08dffebfa98b /ctdb/server/ctdb_vacuum.c
parent04c2115b606f2346fc7315a503b3dae0189e0737 (diff)
downloadsamba-d0b7b3882511769b1bfc1d0d4fdc0dba288e6ccd.tar.gz
samba-d0b7b3882511769b1bfc1d0d4fdc0dba288e6ccd.tar.xz
samba-d0b7b3882511769b1bfc1d0d4fdc0dba288e6ccd.zip
ctdb-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>
Diffstat (limited to 'ctdb/server/ctdb_vacuum.c')
-rw-r--r--ctdb/server/ctdb_vacuum.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 889b5b4b39b..ff607f30e67 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/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;