From cafbec3022d9e4b0fd5a115dbdc643b832b019d8 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Mon, 30 Sep 2019 16:34:35 +1000 Subject: [PATCH] ctdb-vacuum: Process all records not deleted on a remote node This currently skips the last record. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14147 RN: Avoid potential data loss during recovery after vacuuming error Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (cherry picked from commit 33f1c9d9654fbdcb99c23f9d23c4bbe2cc596b98) --- ctdb/server/ctdb_vacuum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c index 0c3770267bc..4fd11e3738c 100644 --- a/ctdb/server/ctdb_vacuum.c +++ b/ctdb/server/ctdb_vacuum.c @@ -814,7 +814,7 @@ static void ctdb_process_delete_list(struct ctdb_db_context *ctdb_db, */ records = (struct ctdb_marshall_buffer *)outdata.dptr; rec = (struct ctdb_rec_data_old *)&records->data[0]; - while (records->count-- > 1) { + while (records->count-- > 0) { TDB_DATA reckey, recdata; struct ctdb_ltdb_header *rechdr; struct delete_record_data *dd; -- 2.23.0