From nobody Tue Nov 18 15:26:27 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610645558; cv=none; d=zohomail.com; s=zohoarc; b=PfT9KIsC+WPTBtxFvZCjJjt1ISOiHkQluQ2RAltHepXCTj2GD/QjFXOBpafQE7RwLGnlJXv6bNcM/symzpR6CUGofMegcGT/+WV/OnKPl2S31nsqzYRDpgcNFTtUVor4R1EwyXfp/YJUWHzGCcDyebaKsFzjmL0m3ewSzpKmHsI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610645558; 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=0ZlDK3ti6VD9Wg4mk5fXQ4rn8uIlnrUMVgAf+ekSndY=; b=TwQ3u41/MwWfZMkmG4YfjdinKvxG1h0bXbrMh3Rr91IJ7jRA/FdU5EQGPKYkOrhW9G95A8ONCKBS2vwg2rs7DwgCWdDPcXnlTZh4kc8dyXWCEz5iwcFzfViX3Yoek9eDSkuo0e2wC1GEMs/YX2nSDgzG6Z44+2rkZoDMSJ5aLSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1610645558015402.13716825985057; Thu, 14 Jan 2021 09:32:38 -0800 (PST) Received: from localhost ([::1]:44694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l06U8-0004jg-NB for importer@patchew.org; Thu, 14 Jan 2021 12:32:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52102) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0622-0007XS-Pl for qemu-devel@nongnu.org; Thu, 14 Jan 2021 12:03:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l061x-0006ux-OM for qemu-devel@nongnu.org; Thu, 14 Jan 2021 12:03:34 -0500 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-89-383evvt1OaKGC9FuUVqXbA-1; Thu, 14 Jan 2021 12:03:24 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 897ACCC622; Thu, 14 Jan 2021 17:03:23 +0000 (UTC) Received: from localhost (ovpn-115-31.ams2.redhat.com [10.36.115.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 20C945D71D; Thu, 14 Jan 2021 17:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610643808; 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=0ZlDK3ti6VD9Wg4mk5fXQ4rn8uIlnrUMVgAf+ekSndY=; b=Y4tEyf6aKOsH/Y+cXAfPTxA5AXMcOktQ07K7GAVzUDx25CMYAMX9l4j7WTdMWADd1TPpgL I4HSRnietpb1OXLQ4fGiiZcjbMm+E+fjjl8RBwbI9G2BSvQmpUaUS0FOtTVZAVoItlJb7y kUYNEqXsMi+asMSj/6qI05TYnxqThws= X-MC-Unique: 383evvt1OaKGC9FuUVqXbA-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 06/10] iotests/129: Use throttle node Date: Thu, 14 Jan 2021 18:03:00 +0100 Message-Id: <20210114170304.87507-7-mreitz@redhat.com> In-Reply-To: <20210114170304.87507-1-mreitz@redhat.com> References: <20210114170304.87507-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com 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=216.205.24.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Throttling on the BB has not affected block jobs in a while, so it is possible that one of the jobs in 129 finishes before the VM is stopped. We can fix that by running the job from a throttle node. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/129 | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129 index dd23bb2e5a..58536bc6ee 100755 --- a/tests/qemu-iotests/129 +++ b/tests/qemu-iotests/129 @@ -32,20 +32,18 @@ class TestStopWithBlockJob(iotests.QMPTestCase): iotests.qemu_img('create', '-f', iotests.imgfmt, self.test_img, "-b", self.base_img, '-F', iotests.imgfmt) iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 1M 128M'= , self.test_img) - self.vm =3D iotests.VM().add_drive(self.test_img) + self.vm =3D iotests.VM() + self.vm.add_object('throttle-group,id=3Dtg0,x-bps-total=3D1024') + + source_drive =3D 'driver=3Dthrottle,' \ + 'throttle-group=3Dtg0,' \ + f'file.driver=3D{iotests.imgfmt},' \ + f'file.file.filename=3D{self.test_img}' + + self.vm.add_drive(None, source_drive) self.vm.launch() =20 def tearDown(self): - params =3D {"device": "drive0", - "bps": 0, - "bps_rd": 0, - "bps_wr": 0, - "iops": 0, - "iops_rd": 0, - "iops_wr": 0, - } - result =3D self.vm.qmp("block_set_io_throttle", conv_keys=3DFalse, - **params) self.vm.shutdown() for img in (self.test_img, self.target_img, self.base_img): iotests.try_remove(img) @@ -53,33 +51,24 @@ class TestStopWithBlockJob(iotests.QMPTestCase): def do_test_stop(self, cmd, **args): """Test 'stop' while block job is running on a throttled drive. The 'stop' command shouldn't drain the job""" - params =3D {"device": "drive0", - "bps": 1024, - "bps_rd": 0, - "bps_wr": 0, - "iops": 0, - "iops_rd": 0, - "iops_wr": 0, - } - result =3D self.vm.qmp("block_set_io_throttle", conv_keys=3DFalse, - **params) - self.assert_qmp(result, 'return', {}) result =3D self.vm.qmp(cmd, **args) self.assert_qmp(result, 'return', {}) + result =3D self.vm.qmp("stop") self.assert_qmp(result, 'return', {}) result =3D self.vm.qmp("query-block-jobs") + self.assert_qmp(result, 'return[0]/status', 'running') self.assert_qmp(result, 'return[0]/ready', False) =20 def test_drive_mirror(self): self.do_test_stop("drive-mirror", device=3D"drive0", - target=3Dself.target_img, + target=3Dself.target_img, format=3Diotests.imgfm= t, sync=3D"full") =20 def test_drive_backup(self): self.do_test_stop("drive-backup", device=3D"drive0", - target=3Dself.target_img, + target=3Dself.target_img, format=3Diotests.imgfm= t, sync=3D"full") =20 def test_block_commit(self): --=20 2.29.2