[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-5.0 v2 21/23] iotests: Add tests for invalid Quorum @replaces
From: |
Max Reitz |
Subject: |
[PATCH for-5.0 v2 21/23] iotests: Add tests for invalid Quorum @replaces |
Date: |
Mon, 11 Nov 2019 17:02:14 +0100 |
Add two tests to see that you cannot replace a Quorum child with the
mirror job while the child is in use by a different parent.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/041 | 70 +++++++++++++++++++++++++++++++++++++-
tests/qemu-iotests/041.out | 4 +--
2 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 0c1af45639..ab0cb5b42f 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -20,6 +20,7 @@
import time
import os
+import re
import iotests
from iotests import qemu_img, qemu_io
@@ -34,6 +35,8 @@ quorum_img3 = os.path.join(iotests.test_dir, 'quorum3.img')
quorum_repair_img = os.path.join(iotests.test_dir, 'quorum_repair.img')
quorum_snapshot_file = os.path.join(iotests.test_dir, 'quorum_snapshot.img')
+nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock')
+
class TestSingleDrive(iotests.QMPTestCase):
image_len = 1 * 1024 * 1024 # MB
qmp_cmd = 'drive-mirror'
@@ -901,7 +904,8 @@ class TestRepairQuorum(iotests.QMPTestCase):
def tearDown(self):
self.vm.shutdown()
- for i in self.IMAGES + [ quorum_repair_img, quorum_snapshot_file ]:
+ for i in self.IMAGES + [ quorum_repair_img, quorum_snapshot_file,
+ nbd_sock_path ]:
# Do a try/except because the test may have deleted some images
try:
os.remove(i)
@@ -1042,6 +1046,70 @@ class TestRepairQuorum(iotests.QMPTestCase):
self.assert_has_block_node("repair0", quorum_repair_img)
self.vm.assert_block_path('quorum0', '/children.1', 'repair0')
+ """
+ Check that we cannot replace a Quorum child when it has other
+ parents.
+ """
+ def test_with_other_parent(self):
+ result = self.vm.qmp('nbd-server-start',
+ addr={
+ 'type': 'unix',
+ 'data': {'path': nbd_sock_path}
+ })
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm.qmp('nbd-server-add', device='img1')
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm.qmp('drive-mirror', job_id='mirror', device='quorum0',
+ sync='full', node_name='repair0', replaces='img1',
+ target=quorum_repair_img, format=iotests.imgfmt)
+ self.assert_qmp(result, 'error/desc',
+ "Cannot replace 'img1' by a node mirrored from "
+ "'quorum0', because it cannot be guaranteed that doing
"
+ "so would not lead to an abrupt change of visible
data")
+
+ """
+ The same as test_with_other_parent(), but add the NBD server only
+ when the mirror job is already running.
+ """
+ def test_with_other_parents_after_mirror_start(self):
+ result = self.vm.qmp('nbd-server-start',
+ addr={
+ 'type': 'unix',
+ 'data': {'path': nbd_sock_path}
+ })
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm.qmp('drive-mirror', job_id='mirror', device='quorum0',
+ sync='full', node_name='repair0', replaces='img1',
+ target=quorum_repair_img, format=iotests.imgfmt)
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm.qmp('nbd-server-add', device='img1')
+ self.assert_qmp(result, 'return', {})
+
+ # The full error message goes to stderr, we will check it later
+ self.complete_and_wait('mirror',
+ completion_error='Operation not permitted')
+
+ # Should not have been replaced
+ self.vm.assert_block_path('quorum0', '/children.1', 'img1')
+
+ # Check the full error message now
+ self.vm.shutdown()
+ log = self.vm.get_log()
+ log = re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log)
+ log = re.sub(r'^Formatting.*\n', '', log)
+ log = re.sub(r'\n\[I \+\d+\.\d+\] CLOSED\n?$', '', log)
+ log = re.sub(r'^qemu-system-[^:]*: ', '', log)
+
+ self.assertEqual(log,
+ "Can no longer replace 'img1' by 'repair0', because "
+
+ "it can no longer be guaranteed that doing so would "
+
+ "not lead to an abrupt change of visible data")
+
+
# Test mirroring with a source that does not have any parents (not even a
# BlockBackend)
class TestOrphanedSource(iotests.QMPTestCase):
diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out
index f496be9197..ffc779b4d1 100644
--- a/tests/qemu-iotests/041.out
+++ b/tests/qemu-iotests/041.out
@@ -1,5 +1,5 @@
-...........................................................................................
+.............................................................................................
----------------------------------------------------------------------
-Ran 91 tests
+Ran 93 tests
OK
--
2.23.0
- [PATCH for-5.0 v2 12/23] block: Remove bdrv_recurse_is_first_non_filter(), (continued)
- [PATCH for-5.0 v2 12/23] block: Remove bdrv_recurse_is_first_non_filter(), Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 13/23] mirror: Double-check immediately before replacing, Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 14/23] quorum: Stop marking it as a filter, Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 15/23] mirror: Prevent loops, Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 16/23] iotests: Use complete_and_wait() in 155, Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 17/23] iotests: Use skip_if_unsupported decorator in 041, Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 18/23] iotests: Add VM.assert_block_path(), Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 19/23] iotests: Resolve TODOs in 041, Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 21/23] iotests: Add tests for invalid Quorum @replaces,
Max Reitz <=
- [PATCH for-5.0 v2 22/23] iotests: Check that @replaces can replace filters, Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 20/23] iotests: Use self.image_len in TestRepairQuorum, Max Reitz, 2019/11/11
- [PATCH for-5.0 v2 23/23] iotests: Mirror must not attempt to create loops, Max Reitz, 2019/11/11
- Re: [PATCH for-5.0 v2 00/23] block: Fix check_to_replace_node(), Vladimir Sementsov-Ogievskiy, 2019/11/29