Skip to content

Commit

Permalink
blockdev: add sync mode to drive-backup QMP command
Browse files Browse the repository at this point in the history 
The drive-backup command is similar to the drive-mirror command, except
no guest data written after the command executes gets copied.  Add a
sync mode argument which determines whether the entire disk is copied,
just allocated clusters, or only clusters being written to by the guest.

Currently only sync mode 'full' is supported - it copies the entire disk.
For read-only point-in-time snapshots we may only need sync mode 'none'
since the target can be a qcow2 file using the guest's disk as its
backing file (no need to copy the entire disk).  Finally, sync mode
'top' is useful if we wish to preserve the backing chain.

Note that this patch just adds the sync mode argument to drive-backup.
It does not implement sync modes 'top' or 'none'.  This patch is
necessary so we can add a drive-backup HMP command that behaves like the
existing drive-mirror HMP command and takes a sync mode.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
@stefanhaRH @kevmw
stefanhaRH authored and kevmw committed Jul 15, 2013
1 parent c3cb8e7 commit b53169e
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 17 deletions.
6 changes: 6 additions & 0 deletions blockdev.c
View file
Expand Up @@ -936,6 +936,7 @@ static void drive_backup_prepare(BlkTransactionState *common, Error **errp)

qmp_drive_backup(backup->device, backup->target,
backup->has_format, backup->format,
backup->sync,
backup->has_mode, backup->mode,
backup->has_speed, backup->speed,
backup->has_on_source_error, backup->on_source_error,
Expand Down Expand Up @@ -1421,6 +1422,7 @@ void qmp_block_commit(const char *device,

void qmp_drive_backup(const char *device, const char *target,
bool has_format, const char *format,
enum MirrorSyncMode sync,
bool has_mode, enum NewImageMode mode,
bool has_speed, int64_t speed,
bool has_on_source_error, BlockdevOnError on_source_error,
Expand All @@ -1435,6 +1437,10 @@ void qmp_drive_backup(const char *device, const char *target,
int64_t size;
int ret;

if (sync != MIRROR_SYNC_MODE_FULL) {
error_setg(errp, "only sync mode 'full' is currently supported");
return;
}
if (!has_speed) {
speed = 0;
}
Expand Down
7 changes: 6 additions & 1 deletion qapi-schema.json
View file
Expand Up @@ -1634,6 +1634,10 @@
# @format: #optional the format of the new destination, default is to
# probe if @mode is 'existing', else the format of the source
#
# @sync: what parts of the disk image should be copied to the destination
# (all the disk, only the sectors allocated in the topmost image, or
# only new I/O).
#
# @mode: #optional whether and how QEMU should create a new image, default is
# 'absolute-paths'.
#
Expand All @@ -1655,7 +1659,8 @@
##
{ 'type': 'DriveBackup',
'data': { 'device': 'str', 'target': 'str', '*format': 'str',
'*mode': 'NewImageMode', '*speed': 'int',
'sync': 'MirrorSyncMode', '*mode': 'NewImageMode',
'*speed': 'int',
'*on-source-error': 'BlockdevOnError',
'*on-target-error': 'BlockdevOnError' } }

Expand Down
6 changes: 5 additions & 1 deletion qmp-commands.hx
View file
Expand Up @@ -913,7 +913,7 @@ EQMP

{
.name = "drive-backup",
.args_type = "device:B,target:s,speed:i?,mode:s?,format:s?,"
.args_type = "sync:s,device:B,target:s,speed:i?,mode:s?,format:s?,"
"on-source-error:s?,on-target-error:s?",
.mhandler.cmd_new = qmp_marshal_input_drive_backup,
},
Expand All @@ -939,6 +939,10 @@ Arguments:
- "format": the format of the new destination, default is to probe if 'mode' is
'existing', else the format of the source
(json-string, optional)
- "sync": what parts of the disk image should be copied to the destination;
possibilities include "full" for all the disk, "top" for only the sectors
allocated in the topmost image, or "none" to only replicate new I/O
(MirrorSyncMode).
- "mode": whether and how QEMU should create a new image
(NewImageMode, optional, default 'absolute-paths')
- "speed": the maximum speed, in bytes per second (json-int, optional)
Expand Down
36 changes: 21 additions & 15 deletions tests/qemu-iotests/055
View file
Expand Up @@ -54,7 +54,7 @@ class TestSingleDrive(iotests.QMPTestCase):
self.assert_no_active_block_jobs()

result = self.vm.qmp('drive-backup', device='drive0',
target=target_img)
target=target_img, sync='full')
self.assert_qmp(result, 'return', {})

event = self.cancel_and_wait()
Expand All @@ -64,7 +64,7 @@ class TestSingleDrive(iotests.QMPTestCase):
self.assert_no_active_block_jobs()

result = self.vm.qmp('drive-backup', device='drive0',
target=target_img)
target=target_img, sync='full')
self.assert_qmp(result, 'return', {})

result = self.vm.qmp('block-job-pause', device='drive0')
Expand All @@ -89,17 +89,17 @@ class TestSingleDrive(iotests.QMPTestCase):

def test_medium_not_found(self):
result = self.vm.qmp('drive-backup', device='ide1-cd0',
target=target_img)
target=target_img, sync='full')
self.assert_qmp(result, 'error/class', 'GenericError')

def test_image_not_found(self):
result = self.vm.qmp('drive-backup', device='drive0',
mode='existing', target=target_img)
target=target_img, sync='full', mode='existing')
self.assert_qmp(result, 'error/class', 'GenericError')

def test_device_not_found(self):
result = self.vm.qmp('drive-backup', device='nonexistent',
target=target_img)
target=target_img, sync='full')
self.assert_qmp(result, 'error/class', 'DeviceNotFound')

class TestSetSpeed(iotests.QMPTestCase):
Expand All @@ -119,7 +119,7 @@ class TestSetSpeed(iotests.QMPTestCase):
self.assert_no_active_block_jobs()

result = self.vm.qmp('drive-backup', device='drive0',
target=target_img)
target=target_img, sync='full')
self.assert_qmp(result, 'return', {})

# Default speed is 0
Expand All @@ -140,7 +140,7 @@ class TestSetSpeed(iotests.QMPTestCase):

# Check setting speed in drive-backup works
result = self.vm.qmp('drive-backup', device='drive0',
target=target_img, speed=4*1024*1024)
target=target_img, sync='full', speed=4*1024*1024)
self.assert_qmp(result, 'return', {})

result = self.vm.qmp('query-block-jobs')
Expand All @@ -154,13 +154,13 @@ class TestSetSpeed(iotests.QMPTestCase):
self.assert_no_active_block_jobs()

result = self.vm.qmp('drive-backup', device='drive0',
target=target_img, speed=-1)
target=target_img, sync='full', speed=-1)
self.assert_qmp(result, 'error/class', 'GenericError')

self.assert_no_active_block_jobs()

result = self.vm.qmp('drive-backup', device='drive0',
target=target_img)
target=target_img, sync='full')
self.assert_qmp(result, 'return', {})

result = self.vm.qmp('block-job-set-speed', device='drive0', speed=-1)
Expand Down Expand Up @@ -196,7 +196,8 @@ class TestSingleTransaction(iotests.QMPTestCase):
result = self.vm.qmp('transaction', actions=[{
'type': 'drive-backup',
'data': { 'device': 'drive0',
'target': target_img },
'target': target_img,
'sync': 'full' },
}
])
self.assert_qmp(result, 'return', {})
Expand All @@ -210,7 +211,8 @@ class TestSingleTransaction(iotests.QMPTestCase):
result = self.vm.qmp('transaction', actions=[{
'type': 'drive-backup',
'data': { 'device': 'drive0',
'target': target_img },
'target': target_img,
'sync': 'full' },
}
])
self.assert_qmp(result, 'return', {})
Expand Down Expand Up @@ -239,7 +241,8 @@ class TestSingleTransaction(iotests.QMPTestCase):
result = self.vm.qmp('transaction', actions=[{
'type': 'drive-backup',
'data': { 'device': 'ide1-cd0',
'target': target_img },
'target': target_img,
'sync': 'full' },
}
])
self.assert_qmp(result, 'error/class', 'GenericError')
Expand All @@ -249,7 +252,8 @@ class TestSingleTransaction(iotests.QMPTestCase):
'type': 'drive-backup',
'data': { 'device': 'drive0',
'mode': 'existing',
'target': target_img },
'target': target_img,
'sync': 'full' },
}
])
self.assert_qmp(result, 'error/class', 'GenericError')
Expand All @@ -259,7 +263,8 @@ class TestSingleTransaction(iotests.QMPTestCase):
'type': 'drive-backup',
'data': { 'device': 'nonexistent',
'mode': 'existing',
'target': target_img },
'target': target_img,
'sync': 'full' },
}
])
self.assert_qmp(result, 'error/class', 'DeviceNotFound')
Expand All @@ -269,7 +274,8 @@ class TestSingleTransaction(iotests.QMPTestCase):
'type': 'drive-backup',
'data': { 'device': 'nonexistent',
'mode': 'existing',
'target': target_img },
'target': target_img,
'sync': 'full' },
}, {
'type': 'Abort',
'data': {},
Expand Down

0 comments on commit b53169e

Please sign in to comment.