|
 |
d76c62 |
From 0dc8024eae1f56e02228171feb824becf21ee697 Mon Sep 17 00:00:00 2001
|
|
|
d76c62 |
Message-Id: <0dc8024eae1f56e02228171feb824becf21ee697@dist-git>
|
|
|
d76c62 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
d76c62 |
Date: Tue, 17 Mar 2020 17:12:46 +0100
|
|
|
d76c62 |
Subject: [PATCH] qemublocktest: Add tests for re-enabling of bitmaps after
|
|
|
d76c62 |
commit
|
|
|
d76c62 |
MIME-Version: 1.0
|
|
|
d76c62 |
Content-Type: text/plain; charset=UTF-8
|
|
|
d76c62 |
Content-Transfer-Encoding: 8bit
|
|
|
d76c62 |
|
|
|
d76c62 |
Some branches were not covered and thus we didn't catch that the bitmaps
|
|
|
d76c62 |
are not re-enabled if nothing is merged into them. Two bitmaps are
|
|
|
d76c62 |
necessary to reliably test the case due to hash table ordering.
|
|
|
d76c62 |
|
|
|
d76c62 |
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
d76c62 |
Tested-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
d76c62 |
(cherry picked from commit cab3622119a73a54e62e5f2d7b4257da00bd4ac8)
|
|
|
d76c62 |
https://bugzilla.redhat.com/show_bug.cgi?id=1799013
|
|
|
d76c62 |
Message-Id: <fc3f48f6a5233fce3148fc21a63c4e0255b2e466.1584461519.git.pkrempa@redhat.com>
|
|
|
d76c62 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
d76c62 |
---
|
|
|
d76c62 |
.../bitmap/snapshots-synthetic-broken.json | 18 ++++++++
|
|
|
d76c62 |
.../bitmap/snapshots-synthetic-broken.out | 2 +
|
|
|
d76c62 |
.../snapshots-synthetic-broken-1-2 | 30 ++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-1-3 | 46 +++++++++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-1-4 | 46 +++++++++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-1-5 | 46 +++++++++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-2-3 | 46 +++++++++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-2-4 | 46 +++++++++++++++++++
|
|
|
d76c62 |
.../snapshots-synthetic-broken-2-5 | 46 +++++++++++++++++++
|
|
|
d76c62 |
9 files changed, 326 insertions(+)
|
|
|
d76c62 |
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
|
|
|
d76c62 |
index bf4963494f..8cf14d4baa 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
|
|
|
d76c62 |
@@ -398,6 +398,24 @@
|
|
|
d76c62 |
"granularity": 65536,
|
|
|
d76c62 |
"count": 0
|
|
|
d76c62 |
},
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "name": "oa",
|
|
|
d76c62 |
+ "recording": true,
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "busy": false,
|
|
|
d76c62 |
+ "status": "active",
|
|
|
d76c62 |
+ "granularity": 65536,
|
|
|
d76c62 |
+ "count": 0
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "name": "ob",
|
|
|
d76c62 |
+ "recording": true,
|
|
|
d76c62 |
+ "persistent": true,
|
|
|
d76c62 |
+ "busy": false,
|
|
|
d76c62 |
+ "status": "active",
|
|
|
d76c62 |
+ "granularity": 65536,
|
|
|
d76c62 |
+ "count": 0
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
{
|
|
|
d76c62 |
"name": "d",
|
|
|
d76c62 |
"recording": true,
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
|
|
|
d76c62 |
index 022630bd76..ad24a580f1 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
|
|
|
d76c62 |
@@ -3,6 +3,8 @@ libvirt-1-format:
|
|
|
d76c62 |
current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
|
|
|
d76c62 |
libvirt-2-format:
|
|
|
d76c62 |
c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
|
|
|
d76c62 |
+ oa: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
|
|
|
d76c62 |
+ ob: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
|
|
|
d76c62 |
d: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
|
|
|
d76c62 |
libvirt-3-format:
|
|
|
d76c62 |
a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
|
|
|
d76c62 |
diff --git a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2 b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
|
|
|
d76c62 |
index d413fbe723..463120d442 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
|
|
|
d76c62 |
@@ -1,4 +1,20 @@
|
|
|
d76c62 |
pre job bitmap disable:
|
|
|
d76c62 |
+[
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-disable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "oa"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-disable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "ob"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+]
|
|
|
d76c62 |
merge bitmpas:
|
|
|
d76c62 |
[
|
|
|
d76c62 |
{
|
|
|
d76c62 |
@@ -23,5 +39,19 @@ merge bitmpas:
|
|
|
d76c62 |
}
|
|
|
d76c62 |
]
|
|
|
d76c62 |
}
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-enable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "oa"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-enable",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "ob"
|
|
|
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 |
index 6eb14f927a..fec6f95dd1 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
|
|
|
d76c62 |
@@ -62,5 +62,51 @@ merge bitmpas:
|
|
|
d76c62 |
}
|
|
|
d76c62 |
]
|
|
|
d76c62 |
}
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "oa",
|
|
|
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": "oa",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "oa"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "ob",
|
|
|
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": "ob",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "ob"
|
|
|
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 |
index f4d9b72576..697230f67b 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
|
|
|
d76c62 |
@@ -69,5 +69,51 @@ merge bitmpas:
|
|
|
d76c62 |
}
|
|
|
d76c62 |
]
|
|
|
d76c62 |
}
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "oa",
|
|
|
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": "oa",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "oa"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "ob",
|
|
|
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": "ob",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "ob"
|
|
|
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 |
index a8e575c2d9..6bf1f0da64 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
|
|
|
d76c62 |
@@ -69,5 +69,51 @@ merge bitmpas:
|
|
|
d76c62 |
}
|
|
|
d76c62 |
]
|
|
|
d76c62 |
}
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "oa",
|
|
|
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": "oa",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "oa"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "ob",
|
|
|
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": "ob",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "ob"
|
|
|
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 |
index d468e2b9d8..f202bb94b1 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
|
|
|
d76c62 |
@@ -39,5 +39,51 @@ merge bitmpas:
|
|
|
d76c62 |
}
|
|
|
d76c62 |
]
|
|
|
d76c62 |
}
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "oa",
|
|
|
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": "oa",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "oa"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-3-format",
|
|
|
d76c62 |
+ "name": "ob",
|
|
|
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": "ob",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "ob"
|
|
|
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 |
index 2a9986bac6..864cc9041b 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
|
|
|
d76c62 |
@@ -46,5 +46,51 @@ merge bitmpas:
|
|
|
d76c62 |
}
|
|
|
d76c62 |
]
|
|
|
d76c62 |
}
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "oa",
|
|
|
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": "oa",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "oa"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-4-format",
|
|
|
d76c62 |
+ "name": "ob",
|
|
|
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": "ob",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "ob"
|
|
|
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 |
index 47d9f6e17a..4c5d8dbe80 100644
|
|
|
d76c62 |
--- a/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
|
|
|
d76c62 |
+++ b/tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
|
|
|
d76c62 |
@@ -46,5 +46,51 @@ merge bitmpas:
|
|
|
d76c62 |
}
|
|
|
d76c62 |
]
|
|
|
d76c62 |
}
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "oa",
|
|
|
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": "oa",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "oa"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ },
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "type": "block-dirty-bitmap-add",
|
|
|
d76c62 |
+ "data": {
|
|
|
d76c62 |
+ "node": "libvirt-5-format",
|
|
|
d76c62 |
+ "name": "ob",
|
|
|
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": "ob",
|
|
|
d76c62 |
+ "bitmaps": [
|
|
|
d76c62 |
+ {
|
|
|
d76c62 |
+ "node": "libvirt-2-format",
|
|
|
d76c62 |
+ "name": "ob"
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
+ ]
|
|
|
d76c62 |
+ }
|
|
|
d76c62 |
}
|
|
|
d76c62 |
]
|
|
|
d76c62 |
--
|
|
|
d76c62 |
2.25.1
|
|
|
d76c62 |
|