sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

ctdb-vacuum: extract check for full vacuum run out of ctdb_vacuum_db_full()

Browse Source 
This is more consistent.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Michael Adam 2014-02-14 18:03:02 +01:00 committed by Amitay Isaacs
parent c88fd19714
commit 01f359cafc
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ctdb/server/ctdb_vacuum.c
View File

@ -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);