diff options
| author | Michael Adam <obnox@samba.org> | 2014-02-14 18:03:02 +0100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2014-03-06 11:31:11 +1100 |
| commit | 01f359cafccb5ae3bea312d628dad92746520527 (patch) | |
| tree | dd5a4e6ca56ed7ebea5e3a58f0a095eb20afda06 /ctdb/server | |
| parent | c88fd19714b98769887dbff59d8c1d077cf351d5 (diff) | |
| download | samba-01f359cafccb5ae3bea312d628dad92746520527.tar.gz samba-01f359cafccb5ae3bea312d628dad92746520527.tar.xz samba-01f359cafccb5ae3bea312d628dad92746520527.zip | |
ctdb-vacuum: extract check for full vacuum run out of ctdb_vacuum_db_full()
This is more consistent.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_vacuum.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c index 6adfa5870ae..2d41ec4280e 100644 --- a/ctdb/server/ctdb_vacuum.c +++ b/ctdb/server/ctdb_vacuum.c @@ -765,15 +765,10 @@ static void ctdb_vacuum_db_fast(struct ctdb_db_context *ctdb_db, * VacuumFastPathCount times. */ static int ctdb_vacuum_db_full(struct ctdb_db_context *ctdb_db, - struct vacuum_data *vdata, - bool full_vacuum_run) + struct vacuum_data *vdata) { int ret; - if (!full_vacuum_run) { - return 0; - } - ret = tdb_traverse_read(ctdb_db->ltdb->tdb, vacuum_traverse, vdata); if (ret == -1 || vdata->traverse_error) { DEBUG(DEBUG_ERR, (__location__ " Traverse error in vacuuming " @@ -1278,9 +1273,11 @@ static int ctdb_vacuum_db(struct ctdb_db_context *ctdb_db, ctdb_vacuum_db_fast(ctdb_db, vdata); - ret = ctdb_vacuum_db_full(ctdb_db, vdata, full_vacuum_run); - if (ret != 0) { - return ret; + if (full_vacuum_run) { + ret = ctdb_vacuum_db_full(ctdb_db, vdata); + if (ret != 0) { + return ret; + } } ret = ctdb_process_vacuum_fetch_lists(ctdb_db, vdata); |