From nobody Sun Oct 5 19:22:58 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=1613161649; cv=none; d=zohomail.com; s=zohoarc; b=C+6W4fyqgm97eU2pIT+GYO6sdRaRxb0FD4v+Xz2oT7dNCAEoT7thZPJWbycNkoWwQV0eg2lb7hhVzC1y8lqk/QpqVx4H3ua7uzS76ZabWLXFhQ2KQ+UFaYy04HvwUndhmcdT0R8fh3JGDZPuuWWfm1JSXJIow5+31Pl7DVO/2q0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613161649; 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=+ZtCvMsXL8J4aFQyPFcujwHjVw+wp+H0ImnLK/amocU=; b=QY31fmpZL26nfkVLxYoxABgDcZ7uPDF1dm8vPa7CtniMghCwGYKvDH/f77mlFKm/3mAa43fzkW+NXrpKn7QPu6fka/TkPo9fLmKH81vWmBCUkLTUceum5A5zfQ3l7T8hb+P4AnIhVKINX+h5Rgx2VBGxbPbhdcZiV0IOcgc0IS4= 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 1613161648891572.7732969008483; Fri, 12 Feb 2021 12:27:28 -0800 (PST) Received: from localhost ([::1]:43756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAf2E-0000kE-Os for importer@patchew.org; Fri, 12 Feb 2021 15:27:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAerr-0004RC-Gk for qemu-devel@nongnu.org; Fri, 12 Feb 2021 15:16:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:40615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lAern-0003vS-Bq for qemu-devel@nongnu.org; Fri, 12 Feb 2021 15:16:43 -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-71-kilVflvxNMeWFGTwX0erxA-1; Fri, 12 Feb 2021 15:16:36 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 446DB1934116; Fri, 12 Feb 2021 20:16:35 +0000 (UTC) Received: from blue.redhat.com (ovpn-114-150.phx2.redhat.com [10.3.114.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCCCC6B8E5; Fri, 12 Feb 2021 20:16:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613160998; 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=+ZtCvMsXL8J4aFQyPFcujwHjVw+wp+H0ImnLK/amocU=; b=PY/GvHQlkAK/5hjaOsM9+4BIaSOv48rUEQvm7W8LmBq/Tbe6rr34hrJQmG02aWyQ1qnteq vAkNwjB33qG4PqC/hh+v8EdU7mySh/K+AjeiWlH/1VussFXZ+KOJP4E0uAlfyXn1s1EB2X gB4YH+BrvS6pkEzaZ5rbG8RHWgi7ZzQ= X-MC-Unique: kilVflvxNMeWFGTwX0erxA-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 14/14] iotests/264: add backup-cancel test-case Date: Fri, 12 Feb 2021 14:16:19 -0600 Message-Id: <20210212201619.1388255-15-eblake@redhat.com> In-Reply-To: <20210212201619.1388255-1-eblake@redhat.com> References: <20210212201619.1388255-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@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=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.569, 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=ham 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 , "open list:Block layer core" , 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" From: Vladimir Sementsov-Ogievskiy Check that cancel doesn't wait for 10s of nbd reconnect timeout. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20210205163720.887197-11-vsementsov@virtuozzo.com> Signed-off-by: Eric Blake --- tests/qemu-iotests/264 | 21 ++++++++++++++------- tests/qemu-iotests/264.out | 4 ++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index 347e53add51b..4f96825a22c2 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -94,20 +94,27 @@ class TestNbdReconnect(iotests.QMPTestCase): result =3D self.vm.qmp('blockdev-del', node_name=3D'backup0') self.assert_qmp(result, 'return', {}) + def cancel_job(self): + result =3D self.vm.qmp('block-job-cancel', device=3D'drive0') + self.assert_qmp(result, 'return', {}) + + start_t =3D time.time() + self.vm.event_wait('BLOCK_JOB_CANCELLED') + delta_t =3D time.time() - start_t + self.assertTrue(delta_t < 2.0) + def test_mirror_cancel(self): # Mirror speed limit doesn't work well enough, it seems that mirror # will run many parallel requests anyway. MAX_IN_FLIGHT is 16 and # MAX_IO_BYTES is 1M in mirror.c, so let's use 20M disk. self.init_vm(20 * 1024 * 1024) self.start_job('blockdev-mirror') + self.cancel_job() - result =3D self.vm.qmp('block-job-cancel', device=3D'drive0') - self.assert_qmp(result, 'return', {}) - - start_t =3D time.time() - self.vm.event_wait('BLOCK_JOB_CANCELLED') - delta_t =3D time.time() - start_t - self.assertTrue(delta_t < 2.0) + def test_backup_cancel(self): + self.init_vm(5 * 1024 * 1024) + self.start_job('blockdev-backup') + self.cancel_job() if __name__ =3D=3D '__main__': diff --git a/tests/qemu-iotests/264.out b/tests/qemu-iotests/264.out index fbc63e62f885..8d7e99670093 100644 --- a/tests/qemu-iotests/264.out +++ b/tests/qemu-iotests/264.out @@ -1,5 +1,5 @@ -.. +... ---------------------------------------------------------------------- -Ran 2 tests +Ran 3 tests OK --=20 2.30.1