From nobody Wed Oct 23 01:24:28 2024 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=1729615793; cv=none; d=zohomail.com; s=zohoarc; b=gXpE8FA0w05VJ2Mby88Uzfbr9+HO2z/atcEgd+NnciOwprGw7JKLkjOgOv8sPXMpPcR0eOLvDyWN2Bcr1FH+wJTU6iRU2bVJVtAGlmsbPntS5iWT2Ai/z059GkHTaEEFCmtDeR4frXMtmXzIJ5GbNS83r3FZzWeYB61McvyF+pI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729615793; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rl0hWf2NeoTp5Fong/EsvdHnc9EM8hnTSIjY+zlizyA=; b=dI4qd8/XivEvI9sTNDlGnG4xwpuKZPnEk//uwwlMUsn/+tk0ihlg5bq7c/niFn5xt4sG2e7emuRu8ApExrkh/Xr/EWzn7gEusUu9VASt/rYagt38j+swMytcjujjT+96/4sauoK4asQ9VHnlxRfliShSn6D8XfkY00TKKOe92zM= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729615793095590.9346947988018; Tue, 22 Oct 2024 09:49:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3I4h-0000YX-Gm; Tue, 22 Oct 2024 12:49:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3I4b-0000L4-Ey for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3I4X-00065x-Jq for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:33 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-75-zkNmY3dsPMOLyiW_5LvZaw-1; Tue, 22 Oct 2024 12:49:27 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 475A11955D92; Tue, 22 Oct 2024 16:49:26 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.70]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 66CD41956056; Tue, 22 Oct 2024 16:49:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729615768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rl0hWf2NeoTp5Fong/EsvdHnc9EM8hnTSIjY+zlizyA=; b=ERG53exUQN6Zc5mZqfchfn6ACkiCosY2+5hKzW/qRH1lD02bLexLk/PkqZoi8p84IH9LwA yWBAOxoFTzPje97Agp/cQqnU1585e0LlqoLbNhJJnHBnckQIK4q9pkiqsdOOMWx45iM3S4 vY7WlGK8uANrbkonl2lFxpOdFVyRP/M= X-MC-Unique: zkNmY3dsPMOLyiW_5LvZaw-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 6/9] iotests/backup-discard-source: don't use actual-size Date: Tue, 22 Oct 2024 18:49:00 +0200 Message-ID: <20241022164903.282174-7-kwolf@redhat.com> In-Reply-To: <20241022164903.282174-1-kwolf@redhat.com> References: <20241022164903.282174-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.519, 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=-1.697, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729615795332116600 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Relying on disk usage is bad thing, and test just doesn't work on XFS. Let's instead add a dirty bitmap to track writes to test image. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-ID: <20240620144402.65896-3-vsementsov@yandex-team.ru> Reviewed-by: Kevin Wolf Tested-by: Kevin Wolf Signed-off-by: Kevin Wolf --- .../qemu-iotests/tests/backup-discard-source | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/tests/backup-discard-source b/tests/qemu-io= tests/tests/backup-discard-source index 05fbe5d26b..17fef9c6d3 100755 --- a/tests/qemu-iotests/tests/backup-discard-source +++ b/tests/qemu-iotests/tests/backup-discard-source @@ -31,12 +31,6 @@ target_img =3D os.path.join(iotests.test_dir, 'target') size =3D 1024 * 1024 =20 =20 -def get_actual_size(vm, node_name): - nodes =3D vm.cmd('query-named-block-nodes', flat=3DTrue) - node =3D next(n for n in nodes if n['node-name'] =3D=3D node_name) - return node['image']['actual-size'] - - class TestBackup(iotests.QMPTestCase): def setUp(self): qemu_img_create('-f', iotests.imgfmt, source_img, str(size)) @@ -84,7 +78,12 @@ class TestBackup(iotests.QMPTestCase): } }) =20 - self.assertLess(get_actual_size(self.vm, 'temp'), 512 * 1024) + self.bitmap =3D { + 'node': 'temp', + 'name': 'bitmap0' + } + + self.vm.cmd('block-dirty-bitmap-add', self.bitmap) =20 def tearDown(self): # That should fail, because region is discarded @@ -113,6 +112,13 @@ class TestBackup(iotests.QMPTestCase): =20 self.vm.event_wait(name=3D'BLOCK_JOB_COMPLETED') =20 + def get_bitmap_count(self): + nodes =3D self.vm.cmd('query-named-block-nodes', flat=3DTrue) + temp =3D next(n for n in nodes if n['node-name'] =3D=3D 'temp') + bitmap =3D temp['dirty-bitmaps'][0] + assert bitmap['name'] =3D=3D self.bitmap['name'] + return bitmap['count'] + def test_discard_written(self): """ 1. Guest writes @@ -125,7 +131,7 @@ class TestBackup(iotests.QMPTestCase): self.assert_qmp(result, 'return', '') =20 # Check that data is written to temporary image - self.assertGreater(get_actual_size(self.vm, 'temp'), size) + self.assertEqual(self.get_bitmap_count(), size) =20 self.do_backup() =20 @@ -138,13 +144,18 @@ class TestBackup(iotests.QMPTestCase): """ self.do_backup() =20 + # backup job did discard operation and pollute the bitmap, + # we have to clean the bitmap, to check next write + self.assertEqual(self.get_bitmap_count(), size) + self.vm.cmd('block-dirty-bitmap-clear', self.bitmap) + # Try trigger copy-before-write operation result =3D self.vm.hmp_qemu_io('cbw', 'write 0 1M') self.assert_qmp(result, 'return', '') =20 # Check that data is not written to temporary image, as region # is discarded from copy-before-write process - self.assertLess(get_actual_size(self.vm, 'temp'), 512 * 1024) + self.assertEqual(self.get_bitmap_count(), 0) =20 =20 if __name__ =3D=3D '__main__': --=20 2.47.0