External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemublocktest: Add more tests for block-commit bitmap handling with snapshots

Browse Source 
Test handling of more complex cases of merging bitmaps accross
snapshots.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-02 17:26:05 +01:00
parent 77b9d574b4
commit 8f096cd880
11 changed files with 828 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/qemublocktest.c
View File

@ -1396,6 +1396,21 @@ 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);

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

@ -0,0 +1,49 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-2-format",
"name": "d"
}
}
]
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"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-2-format",
"target": "d",
"bitmaps": [
{
"node": "libvirt-1-format",
"name": "d"
}
]
}
}
]

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

@ -0,0 +1,76 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-3-format",
"name": "c"
}
}
]
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"
}
]
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "c"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "d",
"persistent": true,
"disabled": true,
"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"
}
]
}
}
]

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

@ -0,0 +1,126 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-4-format",
"name": "a"
}
}
]
merge bitmpas:
[
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "a"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "b",
"persistent": true,
"disabled": true,
"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-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"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "c",
"persistent": true,
"disabled": true,
"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"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "d",
"persistent": true,
"disabled": true,
"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"
}
]
}
}
]

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

@ -0,0 +1,130 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-5-format",
"name": "a"
}
}
]
merge bitmpas:
[
{
"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"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "b",
"persistent": true,
"disabled": true,
"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-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"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "c",
"persistent": true,
"disabled": true,
"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"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "d",
"persistent": true,
"disabled": true,
"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"
}
]
}
}
]

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

@ -0,0 +1,49 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-3-format",
"name": "c"
}
}
]
merge bitmpas:
[
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "c",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "c"
}
]
}
},
{
"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"
}
]
}
}
]

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

@ -0,0 +1,99 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-4-format",
"name": "a"
}
}
]
merge bitmpas:
[
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "a"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "b",
"persistent": true,
"disabled": true,
"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-add",
"data": {
"node": "libvirt-4-format",
"name": "c",
"persistent": true,
"disabled": true,
"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"
}
]
}
},
{
"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"
}
]
}
}
]

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

@ -0,0 +1,103 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-5-format",
"name": "a"
}
}
]
merge bitmpas:
[
{
"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"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "b",
"persistent": true,
"disabled": true,
"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-add",
"data": {
"node": "libvirt-5-format",
"name": "c",
"persistent": true,
"disabled": true,
"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"
}
]
}
},
{
"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"
}
]
}
}
]

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

@ -0,0 +1,72 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-4-format",
"name": "a"
}
}
]
merge bitmpas:
[
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "a",
"bitmaps": [
{
"node": "libvirt-3-format",
"name": "a"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "b",
"persistent": true,
"disabled": true,
"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-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"
}
]
}
}
]

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

@ -0,0 +1,76 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-5-format",
"name": "a"
}
}
]
merge bitmpas:
[
{
"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"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "b",
"persistent": true,
"disabled": true,
"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-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"
}
]
}
}
]

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

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