External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 12:05:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemublocktest: Add 'snapshots' tests for block commit bitmap handling

Browse Source 
Simulate commit between all the combinations of layers in the
'snapshots' case to see whether the code merges the correct bitmaps with
the correct depth of temporary bitmaps.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-05-29 13:03:53 +02:00
parent 79bc7c1828
commit b5eaabfbf8
11 changed files with 987 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/qemublocktest.c
View File

@ -1362,6 +1362,20 @@ mymain(void)
TEST_BITMAP_BLOCKCOMMIT("basic-1-3", 1, 3, "basic");
TEST_BITMAP_BLOCKCOMMIT("basic-2-3", 2, 3, "basic");
TEST_BITMAP_BLOCKCOMMIT("snapshots-1-2", 1, 2, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-1-3", 1, 3, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-1-4", 1, 4, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-1-5", 1, 5, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-2-3", 2, 3, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-2-4", 2, 4, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-2-5", 2, 5, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-3-4", 3, 4, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-3-5", 3, 5, "snapshots");
TEST_BITMAP_BLOCKCOMMIT("snapshots-4-5", 4, 5, "snapshots");
cleanup:
qemuTestDriverFree(&driver);
VIR_FREE(capslatest_x86_64);

105
tests/qemublocktestdata/bitmapblockcommit/snapshots-1-2 Normal file
View File

@ -0,0 +1,105 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-2-format",
"name": "current",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "current",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "current"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "c"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "b"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "a"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "d"
},
{
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-remove",
"data": {
"node": "libvirt-2-format",
"name": "libvirt-tmp-activewrite"
}
}
]

131
tests/qemublocktestdata/bitmapblockcommit/snapshots-1-3 Normal file
View File

@ -0,0 +1,131 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "current",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "current",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "current"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "c"
},
{
"node": "libvirt-2-format",
"name": "c"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "b"
},
{
"node": "libvirt-2-format",
"name": "b"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "a"
},
{
"node": "libvirt-2-format",
"name": "a"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "d",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "d"
},
{
"node": "libvirt-2-format",
"name": "d"
},
{
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-remove",
"data": {
"node": "libvirt-3-format",
"name": "libvirt-tmp-activewrite"
}
}
]

163
tests/qemublocktestdata/bitmapblockcommit/snapshots-1-4 Normal file
View File

@ -0,0 +1,163 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "current",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "current",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "current"
},
{
"node": "libvirt-4-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "c",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "c"
},
{
"node": "libvirt-2-format",
"name": "c"
},
{
"node": "libvirt-3-format",
"name": "c"
},
{
"node": "libvirt-4-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "b",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "b"
},
{
"node": "libvirt-2-format",
"name": "b"
},
{
"node": "libvirt-3-format",
"name": "b"
},
{
"node": "libvirt-4-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "a"
},
{
"node": "libvirt-2-format",
"name": "a"
},
{
"node": "libvirt-3-format",
"name": "a"
},
{
"node": "libvirt-4-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "d",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "d"
},
{
"node": "libvirt-2-format",
"name": "d"
},
{
"node": "libvirt-4-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-remove",
"data": {
"node": "libvirt-4-format",
"name": "libvirt-tmp-activewrite"
}
}
]

167
tests/qemublocktestdata/bitmapblockcommit/snapshots-1-5 Normal file
View File

@ -0,0 +1,167 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "current",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "current",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "current"
},
{
"node": "libvirt-5-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "c",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "c"
},
{
"node": "libvirt-2-format",
"name": "c"
},
{
"node": "libvirt-3-format",
"name": "c"
},
{
"node": "libvirt-5-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "b",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "b"
},
{
"node": "libvirt-2-format",
"name": "b"
},
{
"node": "libvirt-3-format",
"name": "b"
},
{
"node": "libvirt-5-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "a"
},
{
"node": "libvirt-2-format",
"name": "a"
},
{
"node": "libvirt-3-format",
"name": "a"
},
{
"node": "libvirt-4-format",
"name": "a"
},
{
"node": "libvirt-5-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "d",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "d"
},
{
"node": "libvirt-2-format",
"name": "d"
},
{
"node": "libvirt-5-format",
"name": "libvirt-tmp-activewrite"
}
]
}
},
{
"type": "block-dirty-bitmap-remove",
"data": {
"node": "libvirt-5-format",
"name": "libvirt-tmp-activewrite"
}
}
]

65
tests/qemublocktestdata/bitmapblockcommit/snapshots-2-3 Normal file
View File

@ -0,0 +1,65 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "d",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "d"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "a"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "b"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "c"
}
]
}
}
]

97
tests/qemublocktestdata/bitmapblockcommit/snapshots-2-4 Normal file
View File

@ -0,0 +1,97 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "d",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "d"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "a"
},
{
"node": "libvirt-3-format",
"name": "a"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "b",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "b"
},
{
"node": "libvirt-3-format",
"name": "b"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "c",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "c"
},
{
"node": "libvirt-3-format",
"name": "c"
}
]
}
}
]

101
tests/qemublocktestdata/bitmapblockcommit/snapshots-2-5 Normal file
View File

@ -0,0 +1,101 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "d",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "d"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "a"
},
{
"node": "libvirt-3-format",
"name": "a"
},
{
"node": "libvirt-4-format",
"name": "a"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "b",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "b"
},
{
"node": "libvirt-3-format",
"name": "b"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "c",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "c"
},
{
"node": "libvirt-3-format",
"name": "c"
}
]
}
}
]

62
tests/qemublocktestdata/bitmapblockcommit/snapshots-3-4 Normal file
View File

@ -0,0 +1,62 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "c",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "c"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "b",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "b"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "a"
}
]
}
}
]

66
tests/qemublocktestdata/bitmapblockcommit/snapshots-3-5 Normal file
View File

@ -0,0 +1,66 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "c",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "c"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "b",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "b",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "b"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "a"
},
{
"node": "libvirt-4-format",
"name": "a"
}
]
}
}
]

16
tests/qemublocktestdata/bitmapblockcommit/snapshots-4-5 Normal file
View File

@ -0,0 +1,16 @@
merge bitmpas:
[
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-4-format",
"name": "a"
}
]
}
}
]