|
 |
d76c62 |
From 60a2b7411580b4df7a1f9b6f2706fc666d12b170 Mon Sep 17 00:00:00 2001
|
|
|
d76c62 |
Message-Id: <60a2b7411580b4df7a1f9b6f2706fc666d12b170@dist-git>
|
|
|
d76c62 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
d76c62 |
Date: Mon, 16 Mar 2020 22:12:27 +0100
|
|
|
d76c62 |
Subject: [PATCH] qemublocktest: Add tests of broken bitmap chain handling
|
|
|
d76c62 |
during block-commit
|
|
|
d76c62 |
MIME-Version: 1.0
|
|
|
d76c62 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d76c62 |
Content-Transfer-Encoding: 8bit
|
|
|
d76c62 |
|
|
|
d76c62 |
Use the 'snapshots-synthetic-broken' test data for block-commit.
|
|
|
d76c62 |
|
|
|
d76c62 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
d76c62 |
(cherry picked from commit 4e9bb10cf3f3d2c2b13a6e889209e2fac88e1ea7)
|
|
|
d76c62 |
https://bugzilla.redhat.com/show_bug.cgi?id=1799013
|
|
|
d76c62 |
Message-Id: <45e2c5f391fdbf458ffabba516f93d0eb279cd97.1584391727.git.pkrempa@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d76c62 |
---
|
|
|
d76c62 |
tests/qemublocktest.c | 13 ++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-1-2 | 27 +++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-1-3 | 66 +++++++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-1-4 | 73 +++++++++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-1-5 | 73 +++++++++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-2-3 | 43 +++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-2-4 | 50 +++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-2-5 | 50 +++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-3-4 | 27 +++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-3-5 | 27 +++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-4-5 | 20 +++++
|
|
|
d76c62 |
11 files changed, 469 insertions(+)
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
|
|
|
d76c62 |
create mode 100644 tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
|
|
|
d76c62 |
|
|
|
d76c62 |
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
|
|
|
d76c62 |
index ad68b37c80..c8428921fe 100644
|
|
|
d76c62 |
--- a/tests/qemublocktest.c
|
|
|
d76c62 |
+++ b/tests/qemublocktest.c
|
|
|
d76c62 |
@@ -1406,6 +1406,19 @@ mymain(void)
|
|
|
d76c62 |
|
|
|
d76c62 |
TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
|
|
|
d76c62 |
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-2", 1, 2, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-3", 1, 3, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-4", 1, 4, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-1-5", 1, 5, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-3", 2, 3, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-4", 2, 4, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-2-5", 2, 5, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-4", 3, 4, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-3-5", 3, 5, "snapshots-synthetic-broken");
|
|
|
d76c62 |
+
|
|
|
d76c62 |
+ TEST_BITMAP_BLOCKCOMMIT("snapshots-synthetic-broken-4-5", 4, 5, "snapshots-synthetic-broken");
|
|
|
d76c62 |
|
|
|
d76c62 |
cleanup:
|
|
|
d76c62 |
qemuTestDriverFree(&driver);
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..d413fbe723
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
|
|
|
d76c62 |
@@ -0,0 +1,27 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "current",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "target": "current",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "current"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..6eb14f927a
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
|
|
|
d76c62 |
@@ -0,0 +1,66 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-disable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-enable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "current",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "target": "current",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "current"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "c",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": true,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "target": "c",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "c"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..f4d9b72576
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
|
|
|
d76c62 |
@@ -0,0 +1,73 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "b",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "target": "b",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "current",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "target": "current",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "current"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "c",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": true,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "target": "c",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "c"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..a8e575c2d9
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
|
|
|
d76c62 |
@@ -0,0 +1,73 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "b",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "target": "b",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "current",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "target": "current",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-1-format",
|
|
|
d76c62 |
+ "name": "current"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "c",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": true,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "target": "c",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "c"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..d468e2b9d8
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
|
|
|
d76c62 |
@@ -0,0 +1,43 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-disable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-enable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "c",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": true,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "target": "c",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "c"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..2a9986bac6
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
|
|
|
d76c62 |
@@ -0,0 +1,50 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "b",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "target": "b",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "c",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": true,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "target": "c",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "c"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..47d9f6e17a
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
|
|
|
d76c62 |
@@ -0,0 +1,50 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "b",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "target": "b",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "c",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": true,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "target": "c",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "c"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..367a930a74
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-4
|
|
|
d76c62 |
@@ -0,0 +1,27 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "b",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "target": "b",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..0062ec140c
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-3-5
|
|
|
d76c62 |
@@ -0,0 +1,27 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "b",
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "disabled": false,
|
|
|
d76c62 |
+ "granularity": 65536
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-merge",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "target": "b",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "b"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
|
|
|
d76c62 |
new file mode 100644
|
|
|
d76c62 |
index 0000000000..b1f10a8a24
|
|
|
d76c62 |
--- /dev/null
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-4-5
|
|
|
d76c62 |
@@ -0,0 +1,20 @@
|
|
|
d76c62 |
+pre job bitmap disable:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-disable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "a"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
+merge bitmpas:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-enable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "a"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
--
|
|
|
d76c62 |
2.25.1
|
|
|
d76c62 |
|