[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 03/11] iotests/257: Refactor backup helpers
|
From: |
John Snow |
|
Subject: |
[Qemu-block] [PATCH v2 03/11] iotests/257: Refactor backup helpers |
|
Date: |
Mon, 15 Jul 2019 20:01:09 -0400 |
This test needs support for non-bitmap backups and missing or
unspecified bitmap sync modes, so rewrite the helpers to be a little
more generic.
Signed-off-by: John Snow <address@hidden>
---
tests/qemu-iotests/257 | 56 ++++++-----
tests/qemu-iotests/257.out | 192 ++++++++++++++++++-------------------
2 files changed, 128 insertions(+), 120 deletions(-)
diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index bc66ea03b2..aaa8f59504 100755
--- a/tests/qemu-iotests/257
+++ b/tests/qemu-iotests/257
@@ -207,31 +207,37 @@ def get_bitmap(bitmaps, drivename, name, recording=None):
return bitmap
return None
+def blockdev_backup(vm, device, target, sync, **kwargs):
+ # Strip any arguments explicitly nulled by the caller:
+ kwargs = {key: val for key, val in kwargs.items() if val is not None}
+ result = vm.qmp_log('blockdev-backup',
+ device=device,
+ target=target,
+ sync=sync,
+ **kwargs)
+ return result
+
+def blockdev_backup_mktarget(drive, target_id, filepath, sync, **kwargs):
+ target_drive = Drive(filepath, vm=drive.vm)
+ target_drive.create_target(target_id, drive.fmt, drive.size)
+ blockdev_backup(drive.vm, drive.name, target_id, sync, **kwargs)
+
def reference_backup(drive, n, filepath):
log("--- Reference Backup #{:d} ---\n".format(n))
target_id = "ref_target_{:d}".format(n)
job_id = "ref_backup_{:d}".format(n)
- target_drive = Drive(filepath, vm=drive.vm)
-
- target_drive.create_target(target_id, drive.fmt, drive.size)
- drive.vm.qmp_log("blockdev-backup",
- job_id=job_id, device=drive.name,
- target=target_id, sync="full")
+ blockdev_backup_mktarget(drive, target_id, filepath, "full",
+ job_id=job_id)
drive.vm.run_job(job_id, auto_dismiss=True)
log('')
-def bitmap_backup(drive, n, filepath, bitmap, bitmap_mode):
- log("--- Bitmap Backup #{:d} ---\n".format(n))
- target_id = "bitmap_target_{:d}".format(n)
- job_id = "bitmap_backup_{:d}".format(n)
- target_drive = Drive(filepath, vm=drive.vm)
-
- target_drive.create_target(target_id, drive.fmt, drive.size)
- drive.vm.qmp_log("blockdev-backup", job_id=job_id, device=drive.name,
- target=target_id, sync="bitmap",
- bitmap_mode=bitmap_mode,
- bitmap=bitmap,
- auto_finalize=False)
+def backup(drive, n, filepath, sync, **kwargs):
+ log("--- Test Backup #{:d} ---\n".format(n))
+ target_id = "backup_target_{:d}".format(n)
+ job_id = "backup_{:d}".format(n)
+ kwargs.setdefault('auto-finalize', False)
+ blockdev_backup_mktarget(drive, target_id, filepath, sync,
+ job_id=job_id, **kwargs)
return job_id
def perform_writes(drive, n):
@@ -263,7 +269,7 @@ def compare_images(image, reference, baseimg=None,
expected_match=True):
"OK!" if ret == expected_ret else "ERROR!"),
filters=[iotests.filter_testfiles])
-def test_bitmap_sync(bsync_mode, failure=None):
+def test_bitmap_sync(bsync_mode, msync_mode='bitmap', failure=None):
"""
Test bitmap backup routines.
@@ -291,7 +297,7 @@ def test_bitmap_sync(bsync_mode, failure=None):
fbackup0, fbackup1, fbackup2), \
iotests.VM() as vm:
- mode = "Bitmap Sync Mode {:s}".format(bsync_mode)
+ mode = "Mode {:s}; Bitmap Sync {:s}".format(msync_mode, bsync_mode)
preposition = "with" if failure else "without"
cond = "{:s} {:s}".format(preposition,
"{:s} failure".format(failure) if failure
@@ -362,12 +368,13 @@ def test_bitmap_sync(bsync_mode, failure=None):
ebitmap.compare(bitmap)
reference_backup(drive0, 1, fbackup1)
- # 1 - Bitmap Backup (Optional induced failure)
+ # 1 - Test Backup (w/ Optional induced failure)
if failure == 'intermediate':
# Activate blkdebug induced failure for second-to-next read
log(vm.hmp_qemu_io(drive0.name, 'flush'))
log('')
- job = bitmap_backup(drive0, 1, bsync1, "bitmap0", bsync_mode)
+ job = backup(drive0, 1, bsync1, msync_mode,
+ bitmap="bitmap0", bitmap_mode=bsync_mode)
def _callback():
"""Issue writes while the job is open to test bitmap divergence."""
@@ -408,7 +415,8 @@ def test_bitmap_sync(bsync_mode, failure=None):
reference_backup(drive0, 2, fbackup2)
# 2 - Bitmap Backup (In failure modes, this is a recovery.)
- job = bitmap_backup(drive0, 2, bsync2, "bitmap0", bsync_mode)
+ job = backup(drive0, 2, bsync2, "bitmap",
+ bitmap="bitmap0", bitmap_mode=bsync_mode)
vm.run_job(job, auto_dismiss=True, auto_finalize=False)
bitmaps = query_bitmaps(vm)
log(bitmaps, indent=2)
@@ -442,7 +450,7 @@ def test_bitmap_sync(bsync_mode, failure=None):
def main():
for bsync_mode in ("never", "on-success", "always"):
for failure in ("simulated", "intermediate", None):
- test_bitmap_sync(bsync_mode, failure)
+ test_bitmap_sync(bsync_mode, "bitmap", failure)
if __name__ == '__main__':
iotests.script_main(main, supported_fmts=['qcow2'])
diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
index e0775d4815..0abc96acd3 100644
--- a/tests/qemu-iotests/257.out
+++ b/tests/qemu-iotests/257.out
@@ -1,5 +1,5 @@
-=== Bitmap Sync Mode never with simulated failure ===
+=== Mode bitmap; Bitmap Sync never with simulated failure ===
--- Preparing image & VM ---
@@ -86,7 +86,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": {}}
{"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -96,7 +96,7 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1",
"sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
--- Write #2 ---
@@ -147,10 +147,10 @@ expecting 6 dirty sectors; have 6. OK!
= Checking Bitmap (anonymous) =
expecting 7 dirty sectors; have 7. OK!
-{"execute": "job-cancel", "arguments": {"id": "bitmap_backup_1"}}
+{"execute": "job-cancel", "arguments": {"id": "backup_1"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_1", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_1", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -213,7 +213,7 @@ expecting 15 dirty sectors; have 15. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -223,12 +223,12 @@ expecting 15 dirty sectors; have 15. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2",
"sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -265,7 +265,7 @@ qemu_img compare "TEST_DIR/PID-bsync2"
"TEST_DIR/PID-fbackup2" ==> Identical, OK
qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
-=== Bitmap Sync Mode never with intermediate failure ===
+=== Mode bitmap; Bitmap Sync never with intermediate failure ===
--- Preparing image & VM ---
@@ -354,7 +354,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": ""}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -364,10 +364,10 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1",
"sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
-{"data": {"action": "report", "device": "bitmap_backup_1", "operation":
"read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS",
"seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "error": "Input/output error", "len":
67108864, "offset": 66781184, "speed": 0, "type": "backup"}, "event":
"BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
+{"data": {"action": "report", "device": "backup_1", "operation": "read"},
"event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
+{"data": {"device": "backup_1", "error": "Input/output error", "len":
67108864, "offset": 66781184, "speed": 0, "type": "backup"}, "event":
"BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
{
"bitmaps": {
"device0": [
@@ -430,7 +430,7 @@ expecting 14 dirty sectors; have 14. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -440,12 +440,12 @@ expecting 14 dirty sectors; have 14. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2",
"sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -482,7 +482,7 @@ qemu_img compare "TEST_DIR/PID-bsync2"
"TEST_DIR/PID-fbackup2" ==> Identical, OK
qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
-=== Bitmap Sync Mode never without failure ===
+=== Mode bitmap; Bitmap Sync never without failure ===
--- Preparing image & VM ---
@@ -569,7 +569,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": {}}
{"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -579,7 +579,7 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_1",
"sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
--- Write #2 ---
@@ -630,10 +630,10 @@ expecting 6 dirty sectors; have 6. OK!
= Checking Bitmap (anonymous) =
expecting 7 dirty sectors; have 7. OK!
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_1"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_1"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_1", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_1", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -696,7 +696,7 @@ expecting 15 dirty sectors; have 15. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -706,12 +706,12 @@ expecting 15 dirty sectors; have 15. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "never", "device": "drive0", "job-id": "backup_2",
"sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -748,7 +748,7 @@ qemu_img compare "TEST_DIR/PID-bsync2"
"TEST_DIR/PID-fbackup2" ==> Identical, OK
qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
-=== Bitmap Sync Mode on-success with simulated failure ===
+=== Mode bitmap; Bitmap Sync on-success with simulated failure ===
--- Preparing image & VM ---
@@ -835,7 +835,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": {}}
{"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -845,7 +845,7 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"backup_1", "sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
--- Write #2 ---
@@ -896,10 +896,10 @@ expecting 6 dirty sectors; have 6. OK!
= Checking Bitmap (anonymous) =
expecting 7 dirty sectors; have 7. OK!
-{"execute": "job-cancel", "arguments": {"id": "bitmap_backup_1"}}
+{"execute": "job-cancel", "arguments": {"id": "backup_1"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_1", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_1", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -962,7 +962,7 @@ expecting 15 dirty sectors; have 15. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -972,12 +972,12 @@ expecting 15 dirty sectors; have 15. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"backup_2", "sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -1014,7 +1014,7 @@ qemu_img compare "TEST_DIR/PID-bsync2"
"TEST_DIR/PID-fbackup2" ==> Identical, OK
qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
-=== Bitmap Sync Mode on-success with intermediate failure ===
+=== Mode bitmap; Bitmap Sync on-success with intermediate failure ===
--- Preparing image & VM ---
@@ -1103,7 +1103,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": ""}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -1113,10 +1113,10 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"backup_1", "sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
-{"data": {"action": "report", "device": "bitmap_backup_1", "operation":
"read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS",
"seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "error": "Input/output error", "len":
67108864, "offset": 66781184, "speed": 0, "type": "backup"}, "event":
"BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
+{"data": {"action": "report", "device": "backup_1", "operation": "read"},
"event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
+{"data": {"device": "backup_1", "error": "Input/output error", "len":
67108864, "offset": 66781184, "speed": 0, "type": "backup"}, "event":
"BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
{
"bitmaps": {
"device0": [
@@ -1179,7 +1179,7 @@ expecting 14 dirty sectors; have 14. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -1189,12 +1189,12 @@ expecting 14 dirty sectors; have 14. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"backup_2", "sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -1231,7 +1231,7 @@ qemu_img compare "TEST_DIR/PID-bsync2"
"TEST_DIR/PID-fbackup2" ==> Identical, OK
qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
-=== Bitmap Sync Mode on-success without failure ===
+=== Mode bitmap; Bitmap Sync on-success without failure ===
--- Preparing image & VM ---
@@ -1318,7 +1318,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": {}}
{"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -1328,7 +1328,7 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"backup_1", "sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
--- Write #2 ---
@@ -1379,10 +1379,10 @@ expecting 6 dirty sectors; have 6. OK!
= Checking Bitmap (anonymous) =
expecting 7 dirty sectors; have 7. OK!
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_1"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_1"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_1", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_1", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -1445,7 +1445,7 @@ expecting 12 dirty sectors; have 12. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -1455,12 +1455,12 @@ expecting 12 dirty sectors; have 12. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "on-success", "device": "drive0", "job-id":
"backup_2", "sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -1497,7 +1497,7 @@ qemu_img compare "TEST_DIR/PID-bsync2"
"TEST_DIR/PID-fbackup2" ==> Identical, OK
qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
-=== Bitmap Sync Mode always with simulated failure ===
+=== Mode bitmap; Bitmap Sync always with simulated failure ===
--- Preparing image & VM ---
@@ -1584,7 +1584,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": {}}
{"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -1594,7 +1594,7 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1",
"sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
--- Write #2 ---
@@ -1645,10 +1645,10 @@ expecting 6 dirty sectors; have 6. OK!
= Checking Bitmap (anonymous) =
expecting 7 dirty sectors; have 7. OK!
-{"execute": "job-cancel", "arguments": {"id": "bitmap_backup_1"}}
+{"execute": "job-cancel", "arguments": {"id": "backup_1"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_1", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_1", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_CANCELLED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -1711,7 +1711,7 @@ expecting 12 dirty sectors; have 12. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -1721,12 +1721,12 @@ expecting 12 dirty sectors; have 12. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2",
"sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -1763,7 +1763,7 @@ qemu_img compare "TEST_DIR/PID-bsync2"
"TEST_DIR/PID-fbackup2" ==> Identical, OK
qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
-=== Bitmap Sync Mode always with intermediate failure ===
+=== Mode bitmap; Bitmap Sync always with intermediate failure ===
--- Preparing image & VM ---
@@ -1852,7 +1852,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": ""}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -1862,10 +1862,10 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1",
"sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
-{"data": {"action": "report", "device": "bitmap_backup_1", "operation":
"read"}, "event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS",
"seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "error": "Input/output error", "len":
67108864, "offset": 66781184, "speed": 0, "type": "backup"}, "event":
"BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
+{"data": {"action": "report", "device": "backup_1", "operation": "read"},
"event": "BLOCK_JOB_ERROR", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
+{"data": {"device": "backup_1", "error": "Input/output error", "len":
67108864, "offset": 66781184, "speed": 0, "type": "backup"}, "event":
"BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds":
"SECS"}}
{
"bitmaps": {
"device0": [
@@ -1928,7 +1928,7 @@ expecting 13 dirty sectors; have 13. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -1938,12 +1938,12 @@ expecting 13 dirty sectors; have 13. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2",
"sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -1980,7 +1980,7 @@ qemu_img compare "TEST_DIR/PID-bsync2"
"TEST_DIR/PID-fbackup2" ==> Identical, OK
qemu_img compare "TEST_DIR/PID-img" "TEST_DIR/PID-fbackup2" ==> Identical, OK!
-=== Bitmap Sync Mode always without failure ===
+=== Mode bitmap; Bitmap Sync always without failure ===
--- Preparing image & VM ---
@@ -2067,7 +2067,7 @@ expecting 6 dirty sectors; have 6. OK!
{"return": {}}
{"data": {"device": "ref_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #1 ---
+--- Test Backup #1 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -2077,7 +2077,7 @@ expecting 6 dirty sectors; have 6. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id":
"bitmap_backup_1", "sync": "bitmap", "target": "bitmap_target_1"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_1",
"sync": "bitmap", "target": "backup_target_1"}}
{"return": {}}
--- Write #2 ---
@@ -2128,10 +2128,10 @@ expecting 6 dirty sectors; have 6. OK!
= Checking Bitmap (anonymous) =
expecting 7 dirty sectors; have 7. OK!
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_1"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_1"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_1", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_1", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_1", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_1", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
@@ -2194,7 +2194,7 @@ expecting 12 dirty sectors; have 12. OK!
{"return": {}}
{"data": {"device": "ref_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
---- Bitmap Backup #2 ---
+--- Test Backup #2 ---
{}
{"execute": "job-dismiss", "arguments": {"id": "bdc-file-job"}}
@@ -2204,12 +2204,12 @@ expecting 12 dirty sectors; have 12. OK!
{"execute": "job-dismiss", "arguments": {"id": "bdc-fmt-job"}}
{"return": {}}
{}
-{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id":
"bitmap_backup_2", "sync": "bitmap", "target": "bitmap_target_2"}}
+{"execute": "blockdev-backup", "arguments": {"auto-finalize": false, "bitmap":
"bitmap0", "bitmap-mode": "always", "device": "drive0", "job-id": "backup_2",
"sync": "bitmap", "target": "backup_target_2"}}
{"return": {}}
-{"execute": "job-finalize", "arguments": {"id": "bitmap_backup_2"}}
+{"execute": "job-finalize", "arguments": {"id": "backup_2"}}
{"return": {}}
-{"data": {"id": "bitmap_backup_2", "type": "backup"}, "event":
"BLOCK_JOB_PENDING", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
-{"data": {"device": "bitmap_backup_2", "len": 67108864, "offset": 67108864,
"speed": 0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"id": "backup_2", "type": "backup"}, "event": "BLOCK_JOB_PENDING",
"timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+{"data": {"device": "backup_2", "len": 67108864, "offset": 67108864, "speed":
0, "type": "backup"}, "event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
{
"bitmaps": {
"device0": [
--
2.21.0
- Re: [Qemu-block] [PATCH v2 02/11] iotests/257: add EmulatedBitmap class, (continued)
- [Qemu-block] [PATCH v2 04/11] block/backup: hoist bitmap check into QMP interface, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 07/11] block/backup: centralize copy_bitmap initialization, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 08/11] block/backup: add backup_is_cluster_allocated, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 05/11] iotests/257: test API failures, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 06/11] block/backup: improve sync=bitmap work estimates, John Snow, 2019/07/15
- [Qemu-block] [PATCH v2 03/11] iotests/257: Refactor backup helpers,
John Snow <=
- [Qemu-block] [PATCH v2 09/11] block/backup: teach TOP to never copy unallocated regions, John Snow, 2019/07/15
[Qemu-block] [PATCH v2 10/11] block/backup: support bitmap sync modes for non-bitmap backups, John Snow, 2019/07/15