From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11021115.outbound.protection.outlook.com [52.101.65.115]) by lore.virtuozzo.com (Postfix) with ESMTPS id 5412E802A5 for ; Wed, 30 Sep 2026 11:18:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PxVC/l7KcNMPixxG9WJ5xhqh1rdv5JH+n1nn8XNoZVBdpTPb+XuUCqiq3VA9xmFgdRiHPKAjOac4J0JVyHEI+5oqe95qEAyWbWMqIeKTPIXgNMeNwbmv8fCXoaxdZWO6jvGdO9rjpj1B2nHnhNBRMHaQqklZUnNvCN/qteOCyE1/TaF6rpDhRk1YiYDFLr7IrLr+E4+Z7XXLCmkiqHcKtImcx+NxZvFGdY911y+1LCGMyAhK+1OVwu5IxRQeFqFGT7vVy80UOTh+hUv6fHPEEiWg3V5rMFEM1/4wBNNKraEEyKG9ZoeXFTu6nVuo9DwHUIbPsqSs1idbmBqmbonc3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=p2ELMaJWGa/YHluZp6rTIMBgPUmpt7UNQ3YrBhb8Y1I=; b=AGeLKbUKsgwzV5QB0r6Np2BORKFbdBMAwuAnjqBgElv37YPl7V6ZTJ1SrUYIEIROGV+1phyfsPfXb8WpSqlgUT2S26jVAuLhWzNJOXQeqmSyVa6erfJk+rbSbQtXAJecIsJC2fDkNJFU7L0iLrxii2lQFodQN++X1XvC8NUJM3w2lLvfyGntTGxHTzhRmB4NhKmwCrtQREVbZKp0mTxkXJ4vdgbDqlHGZ1GpnHslG5XO4L4oW3THu8IQjCCsBMGXRvqnz+jm98ZSTeFDwPvkTkGOfvoWqVcW5yWDCkKZHA5ETm8fjLg9ZHQfx3ic5oGY24AXiaat4X6dXdpDCf/KZw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 2a00:1450:4864:31::10) smtp.rcpttodomain=virtuozzo.com smtp.mailfrom=openvz.org; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=openvz.org; dkim=pass (signature was verified) header.d=openvz.org; arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.onmicrosoft.com; s=selector2-virtuozzo-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p2ELMaJWGa/YHluZp6rTIMBgPUmpt7UNQ3YrBhb8Y1I=; b=VMoToGtQCWbteycOgeqd0TkVxFjQTvrMtaZXd5/Yh5n7T3QsbjE/VqlouaW+le1G69+j2uxtDabe9yiwThfEB72axupxwmtJLVlriRyf/KE4xIw/eahAL9asQI/Vi4Gbf/ay012/GZkqGJ98/l6+7oPOddC065v5wQPdvmhrNRE= Received: from BE1P281CA0415.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:83::10) by AS8PR08MB7989.eurprd08.prod.outlook.com (2603:10a6:20b:541::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.472.14; Wed, 30 Sep 2026 11:17:52 +0000 Received: from WA1PEPF000099D2.eurprd04.prod.outlook.com (2603:10a6:b10:83:cafe::93) by BE1P281CA0415.outlook.office365.com (2603:10a6:b10:83::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.472.15 via Frontend Transport; Wed, 30 Sep 2026 11:17:51 +0000 Authentication-Results: spf=pass (sender IP is 2a00:1450:4864:31::10) smtp.mailfrom=openvz.org; dkim=pass (signature was verified) header.d=openvz.org;dmarc=pass action=none header.from=openvz.org; Received-SPF: Pass (protection.outlook.com: domain of openvz.org designates 2a00:1450:4864:31::10 as permitted sender) receiver=protection.outlook.com; client-ip=2a00:1450:4864:31::10; helo=mail-wm2-x10.google.com; pr=C Received: from mail-wm2-x10.google.com (2a00:1450:4864:31::10) by WA1PEPF000099D2.mail.protection.outlook.com (2603:10a6:1d8::16a) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.472.14 via Frontend Transport; Wed, 30 Sep 2026 11:17:49 +0000 Received: by mail-wm2-x10.google.com with SMTP id 5b1f17b1804b1-49ffb83bf7aso33232555e9.2 for ; Wed, 30 Sep 2026 04:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=openvz.org; s=google; t=1790767069; x=1791371869; darn=virtuozzo.com; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=p2ELMaJWGa/YHluZp6rTIMBgPUmpt7UNQ3YrBhb8Y1I=; b=Xc2c61cTWMWWkk7AxDhH+69PDHlLTZssv6SQ7qE7FbVbtJB/tP1gQgleSCt41ZSiMn ioQERb3uA3M6z8kc96k1AMFyYKZOUUKPt3F4H6hArPY6+tvt1jpIa/GnMsPTY+V8rAd/ FDajtPHMdbLES5PIe92xaJ5WuM24x51Ymdh9BU6Kt4bdJeeFqxn+a0MZFLg1+OoWmWOj Z0GjmfRK/Vfh7MahuumePU1/9zSu2E7XfqQWUPaxmmuRW1f2BLKDsjc0gdUWGEbv3pwj spy/5QDuy52jEORwlMQOfPKSX8p6hc+uFjtejur0wipX33feJ9e0lW3/Ou41BzZ3DdBt 9g/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790767069; x=1791371869; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=p2ELMaJWGa/YHluZp6rTIMBgPUmpt7UNQ3YrBhb8Y1I=; b=qVX/AvPtWRuYlpKGVIfA3abvgsAjCxRVNFp8lACbUeLXZLY/e5c1RTSMUtKX4Y4ivj zRjMw3jy9NcLEuh//QCOwZ1KvMNWx0uJYsIGh1oE5MKXEjlL0M5tVCEIG7OUrjXEa6fJ FwEsDNYClm7Ug/jHBUJJjQv1CUP5oJ67v9/Iv0J3Wv+1S2/PBFbQct9nkypuJ+fQMsLi wqMPX8p8g2lO6JtxBYdrYWwzlwHQLGlQBCe6+9iXjB64grE37m9Z2g7lDyikuzGsVYbY 86lKedwgzii4aP83tOWIDYsQNVmnKhuHYeWWau90eaj8qAyc9yrfEskrc6kgq1Sb4KN6 nh5Q== X-Gm-Message-State: AFuF++nqe7ZnYIuUGUfp2nJOA9tLRWj6VWnpsByAKmUHr2+xr0au8sj6 3VzB4jhfAKj01lxfEl5vJwWLsm5sRfGUtjMaZOq/8LyfBpR2/L0ZrWx41XDRn0/8RFtVOBEvsa1 oCGNbAqw= X-Gm-Gg: AYBFou3/ROZ6jfHg7HDGKeEhnyQeONQNYHQRhjGOIR5biLNEoGKpPOIrD8bwjV7HTI4 w0JScvETTnYPvgRr0/ZLiWsDiwPfAp+bqI+GjZYtMt7KF32TNpgsEiE3P1wF0jobAcXYAGQHxxU DmHH2cranaUSgOR5TJmFE53rJzXrdCfG/tjFe14Am9gJE8ZzzCedV6RdhyTlrJwKVif3HSyMs3t LTn6UKDERX/iUFJJfuo3KO0OZzynjyPPYtsi741M1BiEbqWybISvFRfD0AKF2kO0IVeZTWQfnhA GHsVPXOGsdBDVOGnWzsLf3uE8PNobWaqlc69sf3Sy/t5ppCbgJwFpxaOr5TO+Yn1j+K/HkrOYHH 7F8iuMsxclGPlp59IM0IJEmQhseoPAvtdr2EgSrStftGx49aaz+/MQd8Ar8kr1hG6zQS7Wp2IkZ 6KsZSCsXKHUapZeLtpBax6FyKKnNpmk6JgHWI8p1G7dGDx+Ubuz5nDONfFQ+qFdJndP/8= X-Received: by 2002:a05:600c:3486:b0:49f:bd3c:bc16 with SMTP id 5b1f17b1804b1-4a01b003c50mr15084175e9.17.1790767069145; Wed, 30 Sep 2026 04:17:49 -0700 (PDT) Received: from athena.sw.ru ([2a06:5b06:b600:300:c6b8:98e2:93f0:2de6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a01cd002bcsm3092365e9.4.2026.09.30.04.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2026 04:17:48 -0700 (PDT) From: "Denis V. Lunev" To: svt-core@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com, den@virtuozzo.com Subject: [PATCH hci-8.0 2/9] iotests/040: cover large and fragmented commit runs #VSTOR-134085 Date: Wed, 30 Sep 2026 13:17:32 +0200 Message-ID: <20260930111739.3866427-3-den@openvz.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260930111739.3866427-1-den@openvz.org> References: <20260930111739.3866427-1-den@openvz.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-EOPTenantAttributedMessage: 0bc7f26d-0264-416e-a6fc-8352af79c58f:0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: WA1PEPF000099D2:EE_|AS8PR08MB7989:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b0726a4-a0f1-4df8-69cc-08df1ee47685 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 0 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|704161411799003|6059299003|82310400026|61400799027|376014|43022699015|48200799018|9140799003|6133799003|22082099003|55112099003|18002099003|16102099003|3023799007|5063699009|56012099006|10067099003; X-Microsoft-Antispam-Message-Info: +psV3BF3gb/R/9em375LgzzKhiIMG4CgCLSq/es96cJx3UeV1f1qhY7TfBmoR9vTs9Fb6vI91jeXhOzG0f+0cZts7J9xEsmqhA8PxFUsvpHuausaYekoGGOR2T9ObI4mneW+q0xm7CrtWHNahJUdvQV6ATObjB4658iIWrFOJEHG+T6dnFE2Ojs4aD+YkpcV6XeHxiYB0/cBkRtNRARb8qJUHEf1F3+vEEfE64Z4lIyE2mqr05kJcwPXFBns/el+VStiYAANbQUm4o6IoI+1hcRoVJ/iA/f4e63StisKS+WMmPKDZ0EEgHsdU7DBiIyrCsKzuRTbMVfNJVCbyHKC6EHY9SFI42kNgWA///yI52xdp75ciewxR/kK5tALcUGZNZRwGGUIBLMh72Vw/gziz2r9DCRF/mcZRm4I1UUHdxurIHQWYeHKaNryNd1gntmi46y5LVrPd7uZlcSN9PLYeFPD5LhlJWruMR6gPZ4r5GNYqVzs/kOAqVUJzYm/hbBrkJN+Or4fx5EKN4tQJuVaXvUT20JqzfVgPj8T1whHLQvjQ0fWM4/BH580lV8JIN7UQTZsmVkon4yuxqMNGpGkeiRNeOECCuLVnrgLEU4tNe6/NjLBVppHLa+mMlbSWyDinfLpk+jXWqigpskx21N30IzZGHUca1Cungb8G3DnEYyTdnVhWqjyjMil4h0LiUtgID0SfGUJQZZxX/vywHBNbncghD36W8XjmnnQ489MJAd0BGXRRo+79IWsAeVzVHKvplnjefRlEQG5tKvl1lLKD/SVcZqafAaS6D/PDTxzH1xXizslARbD/47Rf7CuHXzuKNm+fU8CcHeSsxF8A3UYqkOymPjt605v70lJEY7OAco5qdhCQKi/qcryv8Bk6CRaU8ZWhAXUIv5FgoxYCIUTP3eIDrBe0vgFHP3osRVaj2HJchukHDce25XqjncU6fzA X-Forefront-Antispam-Report: CIP:2a00:1450:4864:31::10;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail-wm2-x10.google.com;PTR:mail-wm2-x10.google.com;CAT:NONE;SFS:(13230040)(704161411799003)(6059299003)(82310400026)(61400799027)(376014)(43022699015)(48200799018)(9140799003)(6133799003)(22082099003)(55112099003)(18002099003)(16102099003)(3023799007)(5063699009)(56012099006)(10067099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: q/nDR55ZPrrWkIqxcPrJAT0GOTlfbOwNHAyPFuOn/d/n2KiLWzd5wOBaWwilSNrgS1ljaSj1kDhGB2KACf7xN1f9GiiGyuhW15Oq3xojcNkIud/CwDTdcfZu0wVAIYqv2DpWv5uLPQEokh6Q9CVl/jYQh5vOwLfLAW2Gig3EtukjILhlivNQOw8qRZfUIVAsDtPJZBC9Zir/b4r0i7UAWG/NIp8uNkrlpovADDv28XWPIT+ogE98G4+4EH8R0XjcZY1IPfDbxOgtz1JAMuq3SM/3/7ZEF3XiW6VCk3tInD5kVrb2tngOilun86e4RTCYe2XRUUBTXnIYVl9LiTJoKogJxNsqTkrMdigjj2iV2x6o0QNgLSq/zT2kYOh53ws5TVWDwLGftz0LL74zUBDaJ/pI4trby6+jKLYC9d7TT/WsgCsEuwradi1pw879vaPj X-ExternalRecipientOutboundConnectors: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2026 11:17:49.9182 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b0726a4-a0f1-4df8-69cc-08df1ee47685 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-AuthSource: WA1PEPF000099D2.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB7989 List-Id: From: Denis V. Lunev 040 never commits runs long enough to span more than one block-status query, so the answer that commit_iteration() is about to start caching goes untested. Add two cases on a base <- mid <- active chain, committing mid so the job takes the regular commit path rather than active commit, and compare base against a snapshot of mid taken before the commit. One case mixes multi-megabyte data, zero and hole runs, the other fragments them down to single clusters with every transition off the 512K boundary. Reviewed-by: Andrey Drobyshev Signed-off-by: Denis V. Lunev CC: Vladimir Sementsov-Ogievskiy CC: John Snow CC: Andrey Drobyshev --- tests/qemu-iotests/040 | 102 ++++++++++++++++++++++++++++++++++++- tests/qemu-iotests/040.out | 4 +- 2 files changed, 103 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 5c18e413ec9..e01c9385bae 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -25,13 +25,14 @@ import time import os import iotests -from iotests import qemu_img, qemu_io +from iotests import qemu_img, qemu_img_create, qemu_io, compare_images import struct import errno backing_img = os.path.join(iotests.test_dir, 'backing.img') mid_img = os.path.join(iotests.test_dir, 'mid.img') test_img = os.path.join(iotests.test_dir, 'test.img') +reference_img = os.path.join(iotests.test_dir, 'reference.img') class ImageCommitTestCase(iotests.QMPTestCase): '''Abstract base class for image commit test cases''' @@ -951,6 +952,105 @@ class TestCommitWithOverriddenBacking(iotests.QMPTestCase): self.vm.qmp('block-job-complete', device='commit') self.vm.event_wait('BLOCK_JOB_COMPLETED') +class TestCommitLargeRuns(iotests.QMPTestCase): + """Commit runs long enough to cross commit_iteration()'s cached span.""" + + MB = 1024 * 1024 + CLUSTER = 64 * 1024 + + # Runs several COMMIT_BUFFER_SIZE (512K) chunks long, of every kind. + SIZE = 32 * MB + LAYOUT = [ + (0, 4 * MB, 'data'), + (4 * MB, 6 * MB, 'hole'), + (10 * MB, 4 * MB, 'data'), + (14 * MB, 6 * MB, 'zero'), + (20 * MB, 4 * MB, 'data'), + (24 * MB, 8 * MB, 'hole'), + ] + + # The same, with every transition off the 512K boundary. + SIZE_FRAGMENTED = 384 * CLUSTER # 24M + LAYOUT_FRAGMENTED = [ + (0, 45 * CLUSTER, 'data'), + (45 * CLUSTER, 55 * CLUSTER, 'hole'), + (100 * CLUSTER, CLUSTER, 'data'), + (101 * CLUSTER, 49 * CLUSTER, 'zero'), + (150 * CLUSTER, 80 * CLUSTER, 'data'), + (230 * CLUSTER, CLUSTER, 'hole'), + (231 * CLUSTER, 69 * CLUSTER, 'data'), + (300 * CLUSTER, 83 * CLUSTER, 'zero'), + (383 * CLUSTER, CLUSTER, 'hole'), + ] + + def setUp(self): + self.vm = iotests.VM() + self.vm.launch() + + def tearDown(self): + self.vm.shutdown() + for img in (backing_img, mid_img, test_img, reference_img): + if os.path.exists(img): + os.remove(img) + + def build_images(self, layout, size): + # A pattern of its own in base, so a misplaced cluster shows up. + qemu_img_create('-f', iotests.imgfmt, backing_img, str(size)) + qemu_io('-c', f'write -P 0x11 0 {size}', backing_img) + + qemu_img_create('-f', iotests.imgfmt, '-b', backing_img, '-F', + iotests.imgfmt, mid_img, str(size)) + for offset, length, kind in layout: + if kind == 'data': + qemu_io('-c', f'write -P 0x22 {offset} {length}', mid_img) + elif kind == 'zero': + qemu_io('-c', f'write -z {offset} {length}', mid_img) + + # What base must equal once mid is committed into it. + qemu_img('convert', '-f', iotests.imgfmt, '-O', iotests.imgfmt, + mid_img, reference_img) + + # An empty layer above mid, so top_node=mid is not the active one. + qemu_img_create('-f', iotests.imgfmt, '-b', mid_img, '-F', + iotests.imgfmt, test_img, str(size)) + + self.vm.cmd('blockdev-add', { + 'node-name': 'base', + 'driver': iotests.imgfmt, + 'file': {'driver': 'file', 'filename': backing_img}, + }) + self.vm.cmd('blockdev-add', { + 'node-name': 'mid', + 'driver': iotests.imgfmt, + 'file': {'driver': 'file', 'filename': mid_img}, + 'backing': 'base', + }) + self.vm.cmd('blockdev-add', { + 'node-name': 'active', + 'driver': iotests.imgfmt, + 'file': {'driver': 'file', 'filename': test_img}, + 'backing': 'mid', + }) + + def commit_and_verify(self): + self.vm.cmd('block-commit', job_id='commit0', device='active', + top_node='mid', base_node='base') + self.wait_until_completed(drive='commit0') + + self.vm.cmd('blockdev-del', node_name='active') + self.vm.cmd('blockdev-del', node_name='mid') + self.vm.cmd('blockdev-del', node_name='base') + self.assertTrue(compare_images(reference_img, backing_img)) + + def test_commit_large_runs(self): + self.build_images(self.LAYOUT, self.SIZE) + self.commit_and_verify() + + def test_commit_fragmented_runs(self): + self.build_images(self.LAYOUT_FRAGMENTED, self.SIZE_FRAGMENTED) + self.commit_and_verify() + + if __name__ == '__main__': iotests.main(supported_fmts=['qcow2', 'qed'], supported_protocols=['file']) diff --git a/tests/qemu-iotests/040.out b/tests/qemu-iotests/040.out index 1bb1dc5f0ea..d2e2a2d98f6 100644 --- a/tests/qemu-iotests/040.out +++ b/tests/qemu-iotests/040.out @@ -1,5 +1,5 @@ -................................................................. +................................................................... ---------------------------------------------------------------------- -Ran 65 tests +Ran 67 tests OK -- 2.53.0