summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2014-02-16 00:35:34 +0100
committerAmitay Isaacs <amitay@gmail.com>2014-03-06 11:31:15 +1100
commit19948702992c94553e1a611540ad398de9f9d8b9 (patch)
tree13f040b03b4ce71784f833ee8383344ade199286 /ctdb
parent7983946680ac0de8f82dfee6f0f849a11653d042 (diff)
downloadsamba-19948702992c94553e1a611540ad398de9f9d8b9.tar.gz
samba-19948702992c94553e1a611540ad398de9f9d8b9.tar.xz
samba-19948702992c94553e1a611540ad398de9f9d8b9.zip
ctdb-vacuum: make ctdb_vacuum_traverse_db() void.
Failure in traversal of the DB should not prevent further processing. Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/server/ctdb_vacuum.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 89327def780..0ebbb41e0d0 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -726,8 +726,8 @@ static void ctdb_process_delete_queue(struct ctdb_db_context *ctdb_db,
* This is not done each time but only every tunable
* VacuumFastPathCount times.
*/
-static int ctdb_vacuum_traverse_db(struct ctdb_db_context *ctdb_db,
- struct vacuum_data *vdata)
+static void ctdb_vacuum_traverse_db(struct ctdb_db_context *ctdb_db,
+ struct vacuum_data *vdata)
{
int ret;
@@ -735,7 +735,6 @@ static int ctdb_vacuum_traverse_db(struct ctdb_db_context *ctdb_db,
if (ret == -1 || vdata->traverse_error) {
DEBUG(DEBUG_ERR, (__location__ " Traverse error in vacuuming "
"'%s'\n", ctdb_db->db_name));
- return -1;
}
if (vdata->full_total > 0) {
@@ -754,7 +753,7 @@ static int ctdb_vacuum_traverse_db(struct ctdb_db_context *ctdb_db,
(unsigned)vdata->full_scheduled));
}
- return 0;
+ return;
}
/**
@@ -1264,10 +1263,7 @@ static int ctdb_vacuum_db(struct ctdb_db_context *ctdb_db,
}
if (full_vacuum_run) {
- ret = ctdb_vacuum_traverse_db(ctdb_db, vdata);
- if (ret != 0) {
- return ret;
- }
+ ctdb_vacuum_traverse_db(ctdb_db, vdata);
}
ctdb_process_delete_queue(ctdb_db, vdata);