Attachment 15518 Details for Bug 14147 – Patch for 4.11, 4.10 and 4.9

[patch] Patch for 4.11, 4.10 and 4.9

BZ14147.patch (text/plain), 1.18 KB, created by Martin Schwenke on 2019-10-08 05:23:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2019-10-08 05:23:57 UTC

Size: 1.18 KB

patch

obsolete

>From cafbec3022d9e4b0fd5a115dbdc643b832b019d8 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>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 <amitay@gmail.com>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>(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
>

Flags:

amitay: review+

Actions: View

Attachments on bug 14147: 15518