From nobody Tue Apr 15 03:54:48 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589547098; cv=none; d=zohomail.com; s=zohoarc; b=ZVazYqMb4uHoOxe/X1seyNBKAcfHlacqcy4fl7xWklV54noQw2mU/UE0n2UO2Qjh7vY/smN6DvvJ8OyjyY8CUORe4lub/1rpAazO9ASh5Kg7O4SNCWENJodX7NwBTFa4JS+nx1Q/YZ3E0xBubXlwnBH+vR575If99jzX6gJztZo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589547098; 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=tCfxbEtQqZs5JrNHeQ27Uq5tlNIM45o4v+oWJ8/63g0=; b=IyKXU/Md6leCTJe5sz8Xyn0Wc2iEWcj9mRQHGEwgN98A+sdZwXrfqkMrC8tIF/AwKUqHEXe6+tzq0uxDbsyZ0+GTsjTAg9KoPH0v4lg8mewMsIklTH3UxflkSZO4fJE9BHJSeAF4YNrDKUNq2rMlgXKrvzEMv50qcSnH5Xh52GM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1589547098815142.58934741084886; Fri, 15 May 2020 05:51:38 -0700 (PDT) Received: from localhost ([::1]:60958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZZoP-0004Fe-JS for importer@patchew.org; Fri, 15 May 2020 08:51:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZih-0002JU-2n for qemu-devel@nongnu.org; Fri, 15 May 2020 08:45:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:47692 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 1jZZif-000278-4x for qemu-devel@nongnu.org; Fri, 15 May 2020 08:45:42 -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-279-GSGZH1FbNkWyx4jDjJqMfw-1; Fri, 15 May 2020 08:45:36 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1186819200C1; Fri, 15 May 2020 12:45:35 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-110.ams2.redhat.com [10.36.113.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 18A3C2E024; Fri, 15 May 2020 12:45:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589546740; 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=tCfxbEtQqZs5JrNHeQ27Uq5tlNIM45o4v+oWJ8/63g0=; b=OPML/uexAboaINJMdoTReN+3eVTwV4lT2HSmQvIOltGbMaY7vnelht7n1VsdTK65pAtMag 1IoaWdOJT6IAiT+48fhxGWSiH3/wSV55t+ASTOc8vraU2xynEDfuu4K01A+rnAQEsnV6Gl zgymgXYsN+pzSEdqztiJPIJOULzax6g= X-MC-Unique: GSGZH1FbNkWyx4jDjJqMfw-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 04/51] iotests: Mirror with different source/target size Date: Fri, 15 May 2020 14:44:34 +0200 Message-Id: <20200515124521.335403-5-kwolf@redhat.com> In-Reply-To: <20200515124521.335403-1-kwolf@redhat.com> References: <20200515124521.335403-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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/14 22:56:02 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, URIBL_BLOCKED=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, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) 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 Message-Id: <20200511135825.219437-5-kwolf@redhat.com> Reviewed-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Kevin Wolf --- 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.4