[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 06/18] block/backup: add 'never' policy to bitmap
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v4 06/18] block/backup: add 'never' policy to bitmap sync mode |
Date: |
Tue, 9 Jul 2019 19:25:38 -0400 |
This adds a "never" policy for bitmap synchronization. Regardless of if
the job succeeds or fails, we never update the bitmap. This can be used
to perform differential backups, or simply to avoid the job modifying a
bitmap.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block/backup.c | 7 +++++--
qapi/block-core.json | 5 ++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index 996941fa61..efd0dcd2e7 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -265,8 +265,11 @@ static void backup_cleanup_sync_bitmap(BackupBlockJob
*job, int ret)
BdrvDirtyBitmap *bm;
BlockDriverState *bs = blk_bs(job->common.blk);
- if (ret < 0) {
- /* Merge the successor back into the parent, delete nothing. */
+ if (ret < 0 || job->bitmap_mode == BITMAP_SYNC_MODE_NEVER) {
+ /*
+ * Failure, or we don't want to synchronize the bitmap.
+ * Merge the successor back into the parent, delete nothing.
+ */
bm = bdrv_reclaim_dirty_bitmap(bs, job->sync_bitmap, NULL);
assert(bm);
} else {
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 99dcd5f099..b1aaaaa98e 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1146,10 +1146,13 @@
# @on-success: The bitmap is only synced when the operation is successful.
# This is the behavior always used for 'INCREMENTAL' backups.
#
+# @never: The bitmap is never synchronized with the operation, and is
+# treated solely as a read-only manifest of blocks to copy.
+#
# Since: 4.2
##
{ 'enum': 'BitmapSyncMode',
- 'data': ['on-success'] }
+ 'data': ['on-success', 'never'] }
##
# @MirrorCopyMode:
--
2.21.0
- [Qemu-block] [PATCH v4 00/18] bitmaps: introduce 'bitmap' sync mode, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 07/18] hbitmap: Fix merge when b is empty, and result is not an alias of a, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 08/18] hbitmap: enable merging across granularities, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 11/18] block/backup: upgrade copy_bitmap to BdrvDirtyBitmap, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 06/18] block/backup: add 'never' policy to bitmap sync mode,
John Snow <=
- [Qemu-block] [PATCH v4 05/18] block/backup: Add mirror sync mode 'bitmap', John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 03/18] blockdev-backup: utilize do_backup_common, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 04/18] qapi: add BitmapSyncMode enum, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 01/18] qapi/block-core: Introduce BackupCommon, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 10/18] block/dirty-bitmap: add bdrv_dirty_bitmap_get, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 14/18] iotests: teach run_job to cancel pending jobs, John Snow, 2019/07/09
- [Qemu-block] [PATCH v4 16/18] iotests: Add virtio-scsi device helper, John Snow, 2019/07/09