From nobody Thu Nov 13 13:39:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580421522946374.6637092160993; Thu, 30 Jan 2020 13:58:42 -0800 (PST) Received: from localhost ([::1]:39922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixHph-0002XV-Rd for importer@patchew.org; Thu, 30 Jan 2020 16:58:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33822) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ixHcw-0005dC-I3 for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:45:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ixHcv-0005i3-5z for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:45:30 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:54502 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ixHcv-0005gW-1T for qemu-devel@nongnu.org; Thu, 30 Jan 2020 16:45:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-156-Wk_DWFIfP9SQAh34Y4J22w-1; Thu, 30 Jan 2020 16:45:23 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BA8AF8024D9; Thu, 30 Jan 2020 21:45:22 +0000 (UTC) Received: from localhost (ovpn-204-145.brq.redhat.com [10.40.204.145]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 530825C1B2; Thu, 30 Jan 2020 21:45:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580420728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZKjPEmfBVqCSgizzCCTUQblhEIiPDt8kq7y1TFHiGR4=; b=d/U24q7Po+dMx9o+71OcBvv3w7eRnDd0n2xlS+NZkFQQbeWRE0ZPIgoS1ouxf2Mr9VnqpK DwWH1ULkRQ4oXLrzpBFqq+chd5vvEFxkq/4pxVszcpMqS575RmWIj0AWArCUuouuHdVU/K k5IY468ZAMMudZNLx6KotAhP7USy+Gk= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 20/21] iotests: Add tests for invalid Quorum @replaces Date: Thu, 30 Jan 2020 22:44:30 +0100 Message-Id: <20200130214431.333510-21-mreitz@redhat.com> In-Reply-To: <20200130214431.333510-1-mreitz@redhat.com> References: <20200130214431.333510-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: Wk_DWFIfP9SQAh34Y4J22w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Vladimir Sementsov-Ogievskiy --- 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 1295a92021..12149c7786 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -20,6 +20,7 @@ =20 import time import os +import re import iotests from iotests import qemu_img, qemu_io =20 @@ -34,6 +35,8 @@ quorum_img3 =3D os.path.join(iotests.test_dir, 'quorum3.i= mg') quorum_repair_img =3D os.path.join(iotests.test_dir, 'quorum_repair.img') quorum_snapshot_file =3D os.path.join(iotests.test_dir, 'quorum_snapshot.i= mg') =20 +nbd_sock_path =3D os.path.join(iotests.test_dir, 'nbd.sock') + class TestSingleDrive(iotests.QMPTestCase): image_len =3D 1 * 1024 * 1024 # MB qmp_cmd =3D 'drive-mirror' @@ -892,7 +895,8 @@ class TestRepairQuorum(iotests.QMPTestCase): =20 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) @@ -1032,6 +1036,70 @@ class TestRepairQuorum(iotests.QMPTestCase): self.assert_has_block_node("repair0", quorum_repair_img) self.vm.assert_block_path('quorum0', '/children.1', 'repair0') =20 + def test_with_other_parent(self): + """ + Check that we cannot replace a Quorum child when it has other + parents. + """ + result =3D self.vm.qmp('nbd-server-start', + addr=3D{ + 'type': 'unix', + 'data': {'path': nbd_sock_path} + }) + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.qmp('nbd-server-add', device=3D'img1') + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.qmp('drive-mirror', job_id=3D'mirror', device= =3D'quorum0', + sync=3D'full', node_name=3D'repair0', replace= s=3D'img1', + target=3Dquorum_repair_img, format=3Diotests.= imgfmt) + self.assert_qmp(result, 'error/desc', + "Cannot replace 'img1' by a node mirrored from " + "'quorum0', because it cannot be guaranteed that d= oing " + "so would not lead to an abrupt change of visible = data") + + def test_with_other_parents_after_mirror_start(self): + """ + The same as test_with_other_parent(), but add the NBD server + only when the mirror job is already running. + """ + result =3D self.vm.qmp('nbd-server-start', + addr=3D{ + 'type': 'unix', + 'data': {'path': nbd_sock_path} + }) + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.qmp('drive-mirror', job_id=3D'mirror', device= =3D'quorum0', + sync=3D'full', node_name=3D'repair0', replace= s=3D'img1', + target=3Dquorum_repair_img, format=3Diotests.= imgfmt) + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.qmp('nbd-server-add', device=3D'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=3D'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 =3D self.vm.get_log() + log =3D re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log) + log =3D re.sub(r'^Formatting.*\n', '', log) + log =3D re.sub(r'\n\[I \+\d+\.\d+\] CLOSED\n?$', '', log) + log =3D re.sub(r'^qemu-system-[^:]*: ', '', log) + + self.assertEqual(log, + "Can no longer replace 'img1' by 'repair0', becau= se " + + "it can no longer be guaranteed that doing so wou= ld " + + "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 =20 OK --=20 2.24.1