60 lines
2.4 KiB
Diff
60 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Ebner <f.ebner@proxmox.com>
|
|
Date: Wed, 2 Mar 2022 08:35:05 +0100
|
|
Subject: [PATCH] block/backup: move bcs bitmap initialization to job creation
|
|
|
|
For backing up the state of multiple disks from the same time, a job
|
|
for each disk has to be created. It's convenient if the jobs don't
|
|
have to be started at the same time and if operation of the VM can be
|
|
resumed after job creation. This would lead to a window between job
|
|
creation and running the job, where writes can happen. But no writes
|
|
should happen between setting up the copy-before-write filter and
|
|
setting up the block copy state bitmap, because then new writes would
|
|
just pass through.
|
|
|
|
Commit 06e0a9c16405c0a4c1eca33cf286cc04c42066a2 moved initalization of
|
|
the bitmap to setting up the copy-before-write filter when sync_mode
|
|
is not MIRROR_SYNC_MODE_BITMAP. Ensure that the bitmap is initialized
|
|
upon job creation for the remaining case too, by moving the
|
|
backup_init_bcs_bitmap call to backup_job_create.
|
|
|
|
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
block/backup.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/block/backup.c b/block/backup.c
|
|
index b2b649e305..b6fa9e8a69 100644
|
|
--- a/block/backup.c
|
|
+++ b/block/backup.c
|
|
@@ -237,8 +237,8 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job)
|
|
true);
|
|
} else if (job->sync_mode == MIRROR_SYNC_MODE_TOP) {
|
|
/*
|
|
- * We can't hog the coroutine to initialize this thoroughly.
|
|
- * Set a flag and resume work when we are able to yield safely.
|
|
+ * Initialization is costly here. Simply set a flag and let the
|
|
+ * backup_run coroutine resume work once it can yield safely.
|
|
*/
|
|
block_copy_set_skip_unallocated(job->bcs, true);
|
|
}
|
|
@@ -252,8 +252,6 @@ static int coroutine_fn backup_run(Job *job, Error **errp)
|
|
BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);
|
|
int ret;
|
|
|
|
- backup_init_bcs_bitmap(s);
|
|
-
|
|
if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
|
|
int64_t offset = 0;
|
|
int64_t count;
|
|
@@ -492,6 +490,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
|
|
block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
|
|
&error_abort);
|
|
|
|
+ backup_init_bcs_bitmap(job);
|
|
+
|
|
return &job->common;
|
|
|
|
error:
|