From nobody Fri Nov 14 16:52:19 2025 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1588863401; cv=none; d=zohomail.com; s=zohoarc; b=J/A3uMOQiNCC6pvm6LIwpOITqdmxHq2viAGs4QPyWzsxsctRT56k2OLb2CIDL/sixcGOG/U5NUMUT2IGKA8Lv8Qz4zxeslToHm3LH9EuoZZKHspVY11cbYebQIodXrVfmmCzNlMcv4hrkS+T6Ex254T6FRDWKKkFBRcnersUbHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588863401; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OMkRXXg8mRgWBU3O3mWn+2EcBY+4PrxcwBh0WP5YI3E=; b=S1VEFkKPNvMTsR8UiWKyCyZK3o1722xKN6U+N6E/NEavh6qSY973SuNOT5cl+iruLnDVymqTteu0ZSTIFF7mIJMLPCM34osde3ude/zQ8Kml3VzxfYeYbi/urCyd19mL+Xn5DeNUjg1K6vdEIy2wfrOMw5EIZA8OTDU/JealISU= ARC-Authentication-Results: i=1; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158886340179472.54740419278778; Thu, 7 May 2020 07:56:41 -0700 (PDT) Received: from localhost ([::1]:36658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWhx2-000263-IS for importer@patchew.org; Thu, 07 May 2020 10:56:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWhtD-0004rC-Ii for qemu-devel@nongnu.org; Thu, 07 May 2020 10:52:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:43223 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jWhtC-0005m6-Kl for qemu-devel@nongnu.org; Thu, 07 May 2020 10:52:43 -0400 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-107-ANI_6uPAN--k6wB4vydSEQ-1; Thu, 07 May 2020 10:52:40 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0804100CCC1; Thu, 7 May 2020 14:52:38 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-33.ams2.redhat.com [10.36.113.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F3E7707BA; Thu, 7 May 2020 14:52:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588863161; 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=OMkRXXg8mRgWBU3O3mWn+2EcBY+4PrxcwBh0WP5YI3E=; b=bO+iUHjl7z7dBQ3dgLfpii5JlyziEAxZP9CHX5iEYXDpjnkRIKmOBed7mYCRGTYUSKGoaF 5Ch0OxZlrs23wulO3WFse3T0s1c8kUdbw+2cCtndyksylMm7Psd25qiauEeqBMkRPMbtb0 ey/jkFIKRDfm5KrbYh3PqrPdLTdjtbk= X-MC-Unique: ANI_6uPAN--k6wB4vydSEQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH 3/3] iotests: Mirror with different source/target size Date: Thu, 7 May 2020 16:52:28 +0200 Message-Id: <20200507145228.323412-4-kwolf@redhat.com> In-Reply-To: <20200507145228.323412-1-kwolf@redhat.com> References: <20200507145228.323412-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 03:56:18 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com 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" This tests that the mirror job catches situations where the target node has a different size than the source node. It must also forbid resize operations when the job is already running. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- tests/qemu-iotests/041 | 45 ++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/041.out | 4 ++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 index 1812dd8479..601c756117 100755 --- a/tests/qemu-iotests/041 +++ b/tests/qemu-iotests/041 @@ -240,6 +240,49 @@ class TestSingleBlockdev(TestSingleDrive): target=3Dself.qmp_target) self.assert_qmp(result, 'error/class', 'GenericError') =20 + def do_test_resize(self, device, node): + def pre_finalize(): + if device: + result =3D self.vm.qmp('block_resize', device=3Ddevice, si= ze=3D65536) + self.assert_qmp(result, 'error/class', 'GenericError') + + result =3D self.vm.qmp('block_resize', node_name=3Dnode, size= =3D65536) + self.assert_qmp(result, 'error/class', 'GenericError') + + result =3D self.vm.qmp(self.qmp_cmd, job_id=3D'job0', device=3D'dr= ive0', + sync=3D'full', target=3Dself.qmp_target, + auto_finalize=3DFalse, auto_dismiss=3DFalse) + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.run_job('job0', auto_finalize=3DFalse, + pre_finalize=3Dpre_finalize) + self.assertEqual(result, None) + + def test_source_resize(self): + self.do_test_resize('drive0', 'top') + + def test_target_resize(self): + self.do_test_resize(None, self.qmp_target) + + def do_test_target_size(self, size): + result =3D self.vm.qmp('block_resize', node_name=3Dself.qmp_target, + size=3Dsize) + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.qmp(self.qmp_cmd, job_id=3D'job0', + device=3D'drive0', sync=3D'full', auto_dismis= s=3DFalse, + target=3Dself.qmp_target) + self.assert_qmp(result, 'return', {}) + + result =3D self.vm.run_job('job0') + self.assertEqual(result, 'Source and target image have different s= izes') + + def test_small_target(self): + self.do_test_target_size(self.image_len // 2) + + def test_large_target(self): + self.do_test_target_size(self.image_len * 2) + test_large_cluster =3D None test_image_not_found =3D None test_small_buffer2 =3D None @@ -251,6 +294,8 @@ class TestSingleDriveZeroLength(TestSingleDrive): =20 class TestSingleBlockdevZeroLength(TestSingleBlockdev): image_len =3D 0 + test_small_target =3D None + test_large_target =3D None =20 class TestSingleDriveUnalignedLength(TestSingleDrive): image_len =3D 1025 * 1024 diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out index 877b76fd31..53abe11d73 100644 --- a/tests/qemu-iotests/041.out +++ b/tests/qemu-iotests/041.out @@ -1,5 +1,5 @@ -..........................................................................= .................... +..........................................................................= .............................. ---------------------------------------------------------------------- -Ran 94 tests +Ran 104 tests =20 OK --=20 2.25.3