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

qemublocktest: Add tests for re-enabling of bitmaps after commit

Browse Source 
Some branches were not covered and thus we didn't catch that the bitmaps
are not re-enabled if nothing is merged into them. Two bitmaps are
necessary to reliably test the case due to hash table ordering.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Tested-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-17 15:51:57 +01:00
parent 7a16318855
commit cab3622119
9 changed files with 326 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.json
View File

@ -398,6 +398,24 @@
"granularity": 65536,
"count": 0
},
{
"name": "oa",
"recording": true,
"persistent": true,
"busy": false,
"status": "active",
"granularity": 65536,
"count": 0
},
{
"name": "ob",
"recording": true,
"persistent": true,
"busy": false,
"status": "active",
"granularity": 65536,
"count": 0
},
{
"name": "d",
"recording": true,

2
tests/qemublocktestdata/bitmap/snapshots-synthetic-broken.out
View File

@ -3,6 +3,8 @@ libvirt-1-format:
current: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
libvirt-2-format:
c: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
oa: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
ob: record:1 busy:0 persist:1 inconsist:0 gran:65536 dirty:0
d: record:1 busy:0 persist:1 inconsist:1 gran:65536 dirty:0
libvirt-3-format:
a: record:0 busy:0 persist:1 inconsist:0 gran:65536 dirty:0

30
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-2
View File

@ -1,4 +1,20 @@
pre job bitmap disable:
[
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-2-format",
"name": "oa"
}
},
{
"type": "block-dirty-bitmap-disable",
"data": {
"node": "libvirt-2-format",
"name": "ob"
}
}
]
merge bitmpas:
[
{
@ -23,5 +39,19 @@ merge bitmpas:
}
]
}
},
{
"type": "block-dirty-bitmap-enable",
"data": {
"node": "libvirt-2-format",
"name": "oa"
}
},
{
"type": "block-dirty-bitmap-enable",
"data": {
"node": "libvirt-2-format",
"name": "ob"
}
}
]

46
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-3
View File

@ -62,5 +62,51 @@ merge bitmpas:
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "oa",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "oa",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "oa"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "ob",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "ob",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "ob"
}
]
}
}
]

46
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-4
View File

@ -69,5 +69,51 @@ merge bitmpas:
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "oa",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "oa",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "oa"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "ob",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "ob",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "ob"
}
]
}
}
]

46
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-1-5
View File

@ -69,5 +69,51 @@ merge bitmpas:
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "oa",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "oa",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "oa"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "ob",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "ob",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "ob"
}
]
}
}
]

46
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-3
View File

@ -39,5 +39,51 @@ merge bitmpas:
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "oa",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "oa",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "oa"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-3-format",
"name": "ob",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-3-format",
"target": "ob",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "ob"
}
]
}
}
]

46
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-4
View File

@ -46,5 +46,51 @@ merge bitmpas:
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "oa",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "oa",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "oa"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-4-format",
"name": "ob",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-4-format",
"target": "ob",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "ob"
}
]
}
}
]

46
tests/qemublocktestdata/bitmapblockcommit/snapshots-synthetic-broken-2-5
View File

@ -46,5 +46,51 @@ merge bitmpas:
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "oa",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "oa",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "oa"
}
]
}
},
{
"type": "block-dirty-bitmap-add",
"data": {
"node": "libvirt-5-format",
"name": "ob",
"persistent": true,
"disabled": false,
"granularity": 65536
}
},
{
"type": "block-dirty-bitmap-merge",
"data": {
"node": "libvirt-5-format",
"target": "ob",
"bitmaps": [
{
"node": "libvirt-2-format",
"name": "ob"
}
]
}
}
]