From nobody Sun Dec 29 18:35:26 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1718894738; cv=none; d=zohomail.com; s=zohoarc; b=ivLJftTlqEgV9Mm1pQ7U2UoIJjbm/ar8Xib6W+Ca2CzwIpmWXKvrz3QR/lJQ2upNVpeJ6q8geDsLWQ7u7dRb6PQ6KG7/Aoe1z+4ANNkh5btkQWe8a1yUNUAyL55+VHEXgIQaYD7j5//VwI8E1lNOIB2kWdo2mythw9fzxPEzApQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718894738; 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=odenp/LNRk8KjjxKjcA9pMJ4w/k6evutOr5gqJFwKqU=; b=kcRgS1Yx9+0LhQF9sY9E9ccpJQbDGp1XVDMg0AMlfyY9UyRtyGXDAiYnX7DDGMW+bId+rpa5lOPP3wZjrQTIHVMCSsr6ffBg7Rj0OXg96PWlu4vqxbAI5lzImXWCODh0z+/9tOwbF0AE1QTzI/wC1OHdTqP3ZmjPUBmJSfdDhhc= 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+importer2=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 171889473882261.99348282094036; Thu, 20 Jun 2024 07:45:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKJ1p-0003Hm-Kj; Thu, 20 Jun 2024 10:44:45 -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 1sKJ1g-0003Fb-1w; Thu, 20 Jun 2024 10:44:36 -0400 Received: from forwardcorp1c.mail.yandex.net ([178.154.239.200]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sKJ1d-00018i-0w; Thu, 20 Jun 2024 10:44:35 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c10:3196:0:640:fabe:0]) by forwardcorp1c.mail.yandex.net (Yandex) with ESMTPS id 5AA4C60C87; Thu, 20 Jun 2024 17:44:29 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6b8:b081:b486::1:24]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 4iL0bh2RiW20-ABHW6XPu; Thu, 20 Jun 2024 17:44:28 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1718894668; bh=odenp/LNRk8KjjxKjcA9pMJ4w/k6evutOr5gqJFwKqU=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=DoXRC7AZ5vseeKtgrKGZ4UDvQYVQLyNR+LDTwvrr62ai4cWeyiZcmQC1upoR3MqjP QeNjwqMTJy6Yud3RwzoSH32j+9iRy0q3ZMAu/rQ2+Sfk7Z+baB73hi1JL6vXnNel/z ZGHy5/vMoiv4c74U5ccYhdGbr+LZp2OJxdvT1qTI= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, vsementsov@yandex-team.ru Subject: [PATCH 2/2] iotests/backup-discard-source: don't use actual-size Date: Thu, 20 Jun 2024 17:44:02 +0300 Message-Id: <20240620144402.65896-3-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240620144402.65896-1-vsementsov@yandex-team.ru> References: <20240620144402.65896-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.154.239.200; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1c.mail.yandex.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1718894739899100009 Content-Type: text/plain; charset="utf-8" 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 --- .../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.34.1