]> git.proxmox.com Git - pve-qemu.git/blob - debian/patches/pve/0041-PVE-always-set-dirty-counter-for-non-incremental-bac.patch
Fix dirty-bitmap PBS backup with multiple drives
[pve-qemu.git] / debian / patches / pve / 0041-PVE-always-set-dirty-counter-for-non-incremental-bac.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Stefan Reiter <s.reiter@proxmox.com>
3 Date: Mon, 6 Jul 2020 14:40:13 +0200
4 Subject: [PATCH] PVE: always set dirty counter for non-incremental backups
5
6 Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
7 ---
8 pve-backup.c | 8 ++++++--
9 1 file changed, 6 insertions(+), 2 deletions(-)
10
11 diff --git a/pve-backup.c b/pve-backup.c
12 index 9e767d724c..c108f6a745 100644
13 --- a/pve-backup.c
14 +++ b/pve-backup.c
15 @@ -742,9 +742,13 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
16 dirty += bdrv_get_dirty_count(bitmap);
17 }
18 di->bitmap = bitmap;
19 - } else if (bitmap != NULL) {
20 + } else {
21 dirty += di->size;
22 - bdrv_release_dirty_bitmap(bitmap);
23 +
24 + /* after a full backup the old dirty bitmap is invalid anyway */
25 + if (bitmap != NULL) {
26 + bdrv_release_dirty_bitmap(bitmap);
27 + }
28 }
29
30 int dev_id = proxmox_backup_co_register_image(pbs, devname, di->size, expect_only_dirty, task->errp);