Skip to content

Commit

Permalink
block/backup: add 'never' policy to bitmap sync mode
Browse files Browse the repository at this point in the history
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 <jsnow@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190709232550.10724-7-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
  • Loading branch information
jnsnow committed Aug 16, 2019
1 parent c8b5650 commit cf0cd29
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
7 changes: 5 additions & 2 deletions block/backup.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,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 {
Expand Down
5 changes: 4 additions & 1 deletion qapi/block-core.json
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit cf0cd29

Please sign in to comment.