From nobody Sun Oct 5 17:29:47 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1748556221; cv=none; d=zohomail.com; s=zohoarc; b=bLB6wssloiz1gWwT+/lxbarhBv+Th2efe2GU147QVZoTtGT9MjbjJSXIFXoQ/klUFgqpeuCnUj91RAD26Bk68CIil8kmZD676BLf0Ab87CnjUV7T3u13e32URIOr2d0jT2KWCdHVokdHoricn0aK+bV2b7tTokStrCbdNCHeE/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748556221; h=Content-Type: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=LeD2BIoGTKUjh+aXkMdd6B4gaNYXyHooACaXJjli2rw=; b=KfwgS3NfaD1QpAMNLOB+l0jOOowOfsQIC5VCZ4EPLJQxmEcNvYxBIYL0tVwKlqVo79HAzV33pgdilCnEscrnbGqELy52ZzCsHHb69Ft6pT6sIu2gagkkqNP5dAInQNMzT/X3vDHenTvNUITaaHVP52Mz6IIgrsNiVf9k1E6aMK4= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748556221612738.9419170802644; Thu, 29 May 2025 15:03:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKlKt-0005ai-Rb; Thu, 29 May 2025 18:02:52 -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 1uKlKs-0005a0-T6 for qemu-devel@nongnu.org; Thu, 29 May 2025 18:02:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKlKq-0002aH-La for qemu-devel@nongnu.org; Thu, 29 May 2025 18:02:50 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-94-9hb9Qq9zMdaGr_n5HbBU3A-1; Thu, 29 May 2025 18:02:44 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 66C691800446; Thu, 29 May 2025 22:02:43 +0000 (UTC) Received: from green.redhat.com (unknown [10.2.16.48]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3CE0A19560AE; Thu, 29 May 2025 22:02:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748556166; 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=LeD2BIoGTKUjh+aXkMdd6B4gaNYXyHooACaXJjli2rw=; b=VYSSmqqMES9AeZNXdwGVdClfxZR08PevBVjm/QeOPQ50hpPTpxMLL4thKPaqP0TXW1mObe OR1QxtZpJNENK/62n+zq1smSiJOZOkP6SoSgp4+4bt/mG9y4gPyyR7kiHcaJQD7BNxLJdU Ls4rHpWrsghVo4kwWIiVeYtrsZJV/xw= X-MC-Unique: 9hb9Qq9zMdaGr_n5HbBU3A-1 X-Mimecast-MFC-AGG-ID: 9hb9Qq9zMdaGr_n5HbBU3A_1748556163 From: Eric Blake To: qemu-devel@nongnu.org Cc: Fiona Ebner , Markus Armbruster , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org (open list:Block layer core) Subject: [PULL 5/6] iotests: Improve mirror-sparse on ext4 and xfs Date: Thu, 29 May 2025 17:02:12 -0500 Message-ID: <20250529220228.1187563-13-eblake@redhat.com> In-Reply-To: <20250529220228.1187563-8-eblake@redhat.com> References: <20250529220228.1187563-8-eblake@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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.133.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1748556223843116600 Content-Type: text/plain; charset="utf-8" Fiona reported that an ext4 filesystem on top of LVM can sometimes report over-allocation to du (based on the heuristics the filesystem is making while observing the contents being mirrored); even though the contents and actual size matched, about 50% of the time the size reported by disk_usage was too large by 4k, failing the test. In auditing other iotests, this is a common problem we've had to deal with. Meanwhile, Markus reported that an xfs filesystem reports disk usage at a default granularity of 1M (so the sparse file occupies 3M, since it has just over 2M data). Reported-by: Fiona Ebner Reported-by: Markus Armbruster Fixes: c0ddcb2c ("tests: Add iotest mirror-sparse for recent patches") Signed-off-by: Eric Blake Reviewed-by: Fiona Ebner Tested-by: Fiona Ebner Message-ID: <20250523163041.2548675-7-eblake@redhat.com> [eblake: Also fix xfs issue] Signed-off-by: Eric Blake --- tests/qemu-iotests/tests/mirror-sparse | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/tests/mirror-sparse b/tests/qemu-iotests/te= sts/mirror-sparse index 8c52a4e2448..11418c08713 100755 --- a/tests/qemu-iotests/tests/mirror-sparse +++ b/tests/qemu-iotests/tests/mirror-sparse @@ -96,13 +96,15 @@ _send_qemu_cmd $h1 '{"execute": "blockdev-del", "argume= nts": {"node-name": "dst"}}' 'return' \ | _filter_block_job_offset | _filter_block_job_len $QEMU_IMG compare -U -f $IMGFMT -F raw $TEST_IMG.base $TEST_IMG +# Some filesystems can fudge allocations for various reasons; rather +# than expecting precise 2M and 20M images, it is better to allow for slop. result=3D$(disk_usage $TEST_IMG) -if test $result -lt $((3*1024*1024)); then +if test $result -lt $((4*1024*1024)); then actual=3Dsparse -elif test $result =3D $((20*1024*1024)); then +elif test $result -gt $((19*1024*1024)); then actual=3Dfull else - actual=3Dunknown + actual=3D"unexpected size ($result)" fi echo "Destination is $actual; expected $expected" } --=20 2.49.0