From patchwork Wed Nov 18 18:04:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915537 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FBD7A6A for ; Wed, 18 Nov 2020 18:15:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4BA521D46 for ; Wed, 18 Nov 2020 18:15:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="NRZuLy73" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4BA521D46 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:52188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfRzp-0004h7-Hl for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:15:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpE-0004YS-3d; Wed, 18 Nov 2020 13:05:00 -0500 Received: from mail-eopbgr140135.outbound.protection.outlook.com ([40.107.14.135]:60229 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpB-0008Rp-HN; Wed, 18 Nov 2020 13:04:59 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DAEdInkelPZrNdWV+YU6YXibaZTCOhouLKgk2TsNRBCCoUZYz/EvBugYw9wUBf5TcOl7a6QlUxYecDOCoY910GyofJQmdIPeQAHLebQ49J1qQWb2ZoDalQFYE0yLUx+bxWL/mxGyarZ8m4XqnWFpx+4soe4R6wSqXPh9Cm9K1mUS2OmWuxvNMurPQBN5uhbnMostfhiD/XZ+Cj0jj9W2bOLidDUdZrU+w/aXojkXZ8yxh33/Q/FdbaI4dNcGZLCC5Wr2t4Y2sEOlWPsYbuWijYdOV2+ODc+ZeCvnGTiFMYeGCzYJrhXp64pSsEoXBDdABFzkl6fUfeSTCwKEa56tTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OJektPw8U8MOfpXPgjoBEMYFx4fcpHFsnjhMzWoAlGU=; b=eBKhQxnz3EVtmhrXd+R3uFa8z3ypofn13AYHG7/MNlaJBVBt2peag/GHr/9oArWKbEWYdLXXwTRiCtFQvfqcNztZ0R5Ya1a/QWJbprWdvBo++6PS0mvWJ5SVno3oewcKmGXjmBGzF7T1ei76b7hFzxTbyYFc9TLNPUn544ckAfo60MZ6+LzfY6rHiMoCLgJNz9As4MYFbAj58PQcBjxvyBzHLu4LTg+/7vugOlZOJ/CDSc9OqVH90QgMvqKqL1NDa9tCFVgPNwj2Gurpd5Z8YMPKytn0WK+rj9U4Ruf8qMsjGG9bOh+kLiSZuYsJpVXAEqnRQjaC10wjLC8QS7VWig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OJektPw8U8MOfpXPgjoBEMYFx4fcpHFsnjhMzWoAlGU=; b=NRZuLy73cFa/IFqPaPsm4cY6164SwE0NqdLpCbwCsLyS+XTyrnkdgz7BoDzzDJvWDCSa2Tji/o/Y2DgKshi05ZpEyfitXYSE1adk4DxsHxLgxmX07ogIIemiWEvGaHt48BpvtzDwqcrSnndssyz/RPU6J569CUPI32MiLa3UCO8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:47 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:47 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 01/11] block: add new BlockDriver handler: bdrv_cancel_in_flight Date: Wed, 18 Nov 2020 21:04:23 +0300 Message-Id: <20201118180433.11931-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16c61875-0f7e-4c07-f10a-08d88bec6f5d X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KkqlINrsT5vp/hXCKH3va9atMvFvORG/fZkGwdZLDzD72DaRzBc7bp8jnWUlAaos9d+nRU6O+VmYokY/9j9zX+Jl9QzRJYZJ16Y2IStoKll+XHZXnsFyLUrE7DurcjBX9v3wk325jr4GAQkuTh+brm7va8BTGt1SIJ0A0guvCgSds/ZBdnTzIoTTKBhMLZO3GwigrXeWYBJbR2EE34jW/LFX5Ej0UwRrqhfn6hFbveQrKbfaJzSqprsfs5Y9/DY1985w3EJRg61mUaJCPnoEk6sAxxSdV5tXY7E11gY0HHzl7ZjmIVoMj4SvXNkLxquMNhQny6RdKEutKmZFwlTQ3g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: Ud96tC6BYxvUxlEsJ0WlCK/ltkBlTBQnH5mpa54tJjB3Zku+54R6pRdB1tpEbdxVyHibSzQOKsCSmvCe9Yp7YrCl2Cf1VHU9uz5JVcwaesxyrbcSN/sShJS30QtpMXfA4ZdC9hqcxARMIPkEyy/7i0H2PZ5qyBAQJOPDY40HCCgbJ3elhKTB6qP3FC3VVxy0DxaqatlkQ5pAIjZ2s2mfuVJwihAVqE7n4Il5YKJ5loGt20idEqxu/o+8uO7eETe5O1Bz/x41NlUFg7Xoox1jDahjquh8tZiMpH+zRjxR27l42oCByF5+BJU9+WJOA9AU6TPBzkOttMdbK3oDdzGAVRv0A9WAFDoVymlTYtziHGLodmNEjv1ONf1tdOXfiZsz0zKAH5aZXD3Cb8qDu8qLkixP2ai0BfrFcCGb9Z4s4l9D4trM+y2e/Xza9ZPeFNtTzljHTMc2eqTeGRYI0YBejITBXcwAuLBwHSWWIVoE+31S7T7ZmorEflRmnc3hxz+hjBZPaWYoaVxdIu8S+DI87a+JE/7vWIrsFu57xnMWxCTHOrIvcciEm1EBMqwJ6Cyy/nlbxEq/VJBr7hqn/RNKhyMQ2bC9dG+OWH5cADNF7xnK11da8CHitKRW9rjzH7FUgfymjzqRRDazo6YySpNPHA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16c61875-0f7e-4c07-f10a-08d88bec6f5d X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:47.1030 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xmDegBfz9DA2BtrifDKi5d73GrNyitXoqsaF/5kZZKNLC5FEBItpD9row/dMzK4rlNUQZt817HuXW2+R0ExELtTNxcT1TsnAxOuVPxw38Tg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.14.135; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:54 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" It will be used to stop retrying NBD requests on mirror cancel. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- include/block/block.h | 3 +++ include/block/block_int.h | 9 +++++++++ block/io.c | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/include/block/block.h b/include/block/block.h index c9d7c58765..3990ee3677 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -836,4 +836,7 @@ int coroutine_fn bdrv_co_copy_range(BdrvChild *src, uint64_t src_offset, BdrvChild *dst, uint64_t dst_offset, uint64_t bytes, BdrvRequestFlags read_flags, BdrvRequestFlags write_flags); + +void bdrv_cancel_in_flight(BlockDriverState *bs); + #endif diff --git a/include/block/block_int.h b/include/block/block_int.h index 95d9333be1..07a87ce5e7 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -344,6 +344,15 @@ struct BlockDriver { bool want_zero, int64_t offset, int64_t bytes, int64_t *pnum, int64_t *map, BlockDriverState **file); + /* + * This informs the driver that we are not more interested in in-flight + * requests results, so don't waste the time if possible. + * + * The example usage is to not wait for nbd target nodedreconnect timeout on + * job-cancel. + */ + void (*bdrv_cancel_in_flight)(BlockDriverState *bs); + /* * Invalidate any cached meta-data. */ diff --git a/block/io.c b/block/io.c index ec5e152bb7..5dcb6433f9 100644 --- a/block/io.c +++ b/block/io.c @@ -3288,3 +3288,14 @@ out: return ret; } + +void bdrv_cancel_in_flight(BlockDriverState *bs) +{ + if (!bs || !bs->drv) { + return; + } + + if (bs->drv->bdrv_cancel_in_flight) { + bs->drv->bdrv_cancel_in_flight(bs); + } +} From patchwork Wed Nov 18 18:04:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915533 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78E0FA6A for ; Wed, 18 Nov 2020 18:14:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D143320B80 for ; Wed, 18 Nov 2020 18:14:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="dLz1RDlA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D143320B80 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfRxv-0003FL-KO for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:13:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpF-0004aJ-BW; Wed, 18 Nov 2020 13:05:01 -0500 Received: from mail-eopbgr130110.outbound.protection.outlook.com ([40.107.13.110]:34980 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpC-0008Qn-2S; Wed, 18 Nov 2020 13:05:00 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ix4E3YC2pXJs8PDXCUb4erVNGk6mLxFHHOhP1v8vXkxEEGyF/tNeNhaNmuejR+1yYdPtviVo20TYRQabMR9/i2PHVvQB9HXNTNo1FTx3UQxPdrCXbfr9fDOudgB4tzRpq+W08/54bOkV/fet+YMASXj0vyizuRKw1Ss1/isB+dkEx+5W4Ekg41aOwByR9SAAH61ESHXQfs6yCXJ/wHD1gArzgNfNh4u1Xnu3psoOb9JumYr4AqINHn8Zgclp0Zh3U6yNmmwQ7TjA/5Uwmzy0LNJXygqWPRoCbEsfHF6e+7bcNadWgzW0Q1s5MryUZOKP0LGqVk7K28gy8gQLuKHBdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=syH2bRGGfv2feXTxLbmydlAm/5WfJY809yJQqBYGHVU=; b=Z21zoOUzCHu2lLietNlUCvU/vpAHjO2jPi8NWsWAwVlaDy3okl7chFAKpC+HC9usSiBDLNTdgZy6nSP+DLpSUxO0bhtKUvQi/1S2e+SJ8U9Uidb/FARKqpTwGBmz3SskxwO+u7TvkvpXOMZroh0plvfsTvH8m6nFedqnJ7eJ6A/eYjn9uCuz/xOuab7bBZfcJRgVgUX6gA1dq4HW7QtmWVGZ3yZ8CfnCbUJ7GrTNvhEw1akkRsRLKR0iXTZTJZi/ksyWkiMbaEhV4JWLAyx64Hv2sswd7Wq88rqbMdfSZTHnAOFCYgezMkYCrvY3Xe3zf+Fd/Eu0iC+ylAmov2CbAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=syH2bRGGfv2feXTxLbmydlAm/5WfJY809yJQqBYGHVU=; b=dLz1RDlAmehKEnY3XEmE6YpwpI42DVrCqFKCRnnZQrsWlzI95HPa1uDQK/dWg+netSUhyl7qwFau16RbmN5T/ytIU6pupThy1NtZKBLEQyr88Us9jJRt/lGGuo/La8FdlL0OEYBDEx/tHeCiR2iSKdAMa1el1aSyyV7WDrosZGc= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:48 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:48 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 02/11] block/nbd: implement .bdrv_cancel_in_flight Date: Wed, 18 Nov 2020 21:04:24 +0300 Message-Id: <20201118180433.11931-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 11c2e3d2-f268-489e-2c8f-08d88bec6fd7 X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:132; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J/YyFjyge46W4GS4+Fs2z0fPsMKSORlsQlhM7xZTTXv6k58f064eNWl1RFh9NOXBnq6u6ym2Uq66anYHb/ZFplgL7h1HRz+QS+ctsKwzHpjC/+AZI+TFPcgfDvRTN1jcIIXTKI2aPEcrf1vKPS+Y0y+Ck7kDRpGuga4O5MPCUZEs0iezJ960hEb5/pKlGAJMB7kY8GL/Zf73hc6/WbdT4/OVVInOm6R4cdlvSZ+MlZkSkjy1UG1b2JmcvuR8cBranU/CzqkGi3X+sGSR+843jeAj/d6ja3qzNnj1RPTG4wSUgOsBlbyeSCvqorDIbt6x+5NCrNHh95wNY6pMMIGQ0hWLDuODZ4uFFW5bPC5N6FlfMpb1I4fTKxriSQ7yHG96 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003)(142923001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: qWMyPp/0J1pTqXWKtkqjhO9rFSXVunC4DOjsWfuJJQAHxHJMJdW/S4bN03AZBAsf7z4hA/ydGKkc0e6XAeBKxLceP8IY2FgDn5CY8/JVWOZ7f6BXBFQ8Uf06ShOhGofIirX6/h0I7/VTrsRQ+RSpKP7rUqHyzpJY3j1obnHanDjZ/hft41wjhHjyvYjiqU59ZESlRmJf/JuYpf2SxMW5myyGtVlGGT0LQDfLLIao9z/q2f9izequejbFokNjE/rpI8Mi0agiJKfmI/FL0M3n/brJrsZt0lwItH52T1VlW/+3XxEh/QQ+TpqGRy7vHQ8ivMs/OEO8VdSH7qY24ijKJ8U5zLw54nEVFPJoxVNi0ARaZjiFCQsllFhYF4GMuBnQwfZr/QqNh34AxgULq+1TNn9tL/eC0HmFTria78graKodQEAnn1g5JUb9gXm82elKtDC0+ncgad/rgYx+2yb2TMx0kHLAXPi3Hmqdh2ugjoy6oto0vUqOkS8zVL300UfwK2bf3n8ley7lDo+WE7BuIo4CcaaF0d2eZ4SmGYuuksXscOHlCQxgueMpOdCWgFuN1PE9DE1F7gce9jcIFN/2O63rlftQHw5Jm/C27lTjBSD8RDScjW3BtTGJnocwaukE5IqIdkSFZprUhNGUVyhQzQ== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11c2e3d2-f268-489e-2c8f-08d88bec6fd7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:47.9314 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: oqU1KhAQFDGhTyMRmeqRk5o3ATKlVC2TqNsHNty6zW4WNiwshQbcXZAnc/oDD+VTbTOiBjpCVI2XsqRRuK/9ntXKqMYJYK7HF523Aqh4hF4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.13.110; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:46 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Just stop waiting for connection in existing requests. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/block/nbd.c b/block/nbd.c index 42536702b6..887410b106 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -2419,6 +2419,18 @@ static const char *const nbd_strong_runtime_opts[] = { NULL }; +static void nbd_cancel_in_flight(BlockDriverState *bs) +{ + BDRVNBDState *s = (BDRVNBDState *)bs->opaque; + + reconnect_delay_timer_del(s); + + if (s->state == NBD_CLIENT_CONNECTING_WAIT) { + s->state = NBD_CLIENT_CONNECTING_NOWAIT; + qemu_co_queue_restart_all(&s->free_sema); + } +} + static BlockDriver bdrv_nbd = { .format_name = "nbd", .protocol_name = "nbd", @@ -2445,6 +2457,7 @@ static BlockDriver bdrv_nbd = { .bdrv_co_block_status = nbd_client_co_block_status, .bdrv_dirname = nbd_dirname, .strong_runtime_opts = nbd_strong_runtime_opts, + .bdrv_cancel_in_flight = nbd_cancel_in_flight, }; static BlockDriver bdrv_nbd_tcp = { @@ -2473,6 +2486,7 @@ static BlockDriver bdrv_nbd_tcp = { .bdrv_co_block_status = nbd_client_co_block_status, .bdrv_dirname = nbd_dirname, .strong_runtime_opts = nbd_strong_runtime_opts, + .bdrv_cancel_in_flight = nbd_cancel_in_flight, }; static BlockDriver bdrv_nbd_unix = { @@ -2501,6 +2515,7 @@ static BlockDriver bdrv_nbd_unix = { .bdrv_co_block_status = nbd_client_co_block_status, .bdrv_dirname = nbd_dirname, .strong_runtime_opts = nbd_strong_runtime_opts, + .bdrv_cancel_in_flight = nbd_cancel_in_flight, }; static void bdrv_nbd_init(void) From patchwork Wed Nov 18 18:04:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915543 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34FAB14C0 for ; Wed, 18 Nov 2020 18:19:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BB85F2087D for ; Wed, 18 Nov 2020 18:19:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="K/qCFodS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB85F2087D Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfS3G-0008Jz-CB for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:19:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpG-0004do-Ur; Wed, 18 Nov 2020 13:05:03 -0500 Received: from mail-eopbgr140135.outbound.protection.outlook.com ([40.107.14.135]:60229 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpE-0008Rp-SM; Wed, 18 Nov 2020 13:05:02 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=homqPMtNSAFcVh5RIEQyAyKRCTiz2Np1uQTItCBvfoe9sIC4z3PaKO2RCm6fzt/pJa7ZjiPwtTcVLy9CtcMpzchlUtlIG+dYXgOMKkgnJOtfrNOhpn0JDZ7E4ijjIae60MUEk2Q4yX2BO5JKS0LyHtVtyMJgz5mm3Gquf8USWHtTtW716bH024CwFnTvFu3HOuvyU571Clb32Z+1/FWee09/Qn8jycP+u1T+TLnxPDcVQFCyzCiNxNGocgIAWz5L4gPOGaWNrh+Gi6K96lkSsYGN3q5Nj8xZDZ0SosGPPF4O314VKWoIlz3IuAgBIRwCVT1st6J9YXoVDF16MIg20Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xNFRUp0mQ0s/nWQQfGelmRdP2OuLyZprvBZEBobA4Xc=; b=iz8h0lmT4BczChaGMEvjHDizM5sfdckbyMJIyddeeYaFbzLd5IuSWHoLi4mCjPvapr41ubZsnGP5GP4XN/3x68jhzMXAKWJV+OHJB4P6vp9A+bLZ1cA80E1ozxKLJcZY6N669wzBNg/FG+wpQpfjm4+inWwxdGcEEAJy8clf+31FYCMKXc1Sku0zjxYS5wJfxQC85Cp5mkoEkIw113YFtzDzwVBZriLJ7ZVgtlL+TgjcPaxNP9fTzpr3tQOtJUaIek6qVpk51WAU7UX4ApVrGcgTzKV/QlubG3S3gdhXxKzDzZYr111Ec5Bmd5aza2xSvqS7g11kY357ndrbm0toDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xNFRUp0mQ0s/nWQQfGelmRdP2OuLyZprvBZEBobA4Xc=; b=K/qCFodSdDeXqeJH8bWgdNgh5v4GsJoOOCJK2Lt+mxAYrwFXTxE+ZyC68xYSGM8XVllzxUu09NTzVJN+WP6f7V/SvzDtrhr3Jqlaw31fo8wojqrnPA0Cw74TmUoQYv1fZQ3OlVFc9V2y0s/nYFuaZoUyQZf2v6I3LekAE10IaTs= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:50 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:48 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 03/11] block/raw-format: implement .bdrv_cancel_in_flight handler Date: Wed, 18 Nov 2020 21:04:25 +0300 Message-Id: <20201118180433.11931-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bfd072cc-0e1d-4731-5f2d-08d88bec7065 X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bNLhATuwZA7dP1rZ9Url3V9Q9Fu4d/ykM2tkQ0H/ttku4Q1C5K641gtF8jb0Syyd9vxTskJwpSehTIWpq+rsGLif4BnToWSyHCz08u0s8imNPRSV15TErCfY65WLl0G9gRrJ68cH+d7Z6XQh1WEa2Zw505BA/tAH6GxD+Hg0yNzl+A3vLIic4GBsOvQ5rwfJ5a19iy2KkDFc6lZPPAlZ+QexCpfXu/5DzalhVlCLe59mpZQn788PP3WYkIxmlFjycIfVOspDXSLFjGBJSVTnqOzehGNE6Jxcm3SlQpjCjnnq7jL/O3TehXRelIN2q595s2zhvAhCEgdOsr15VTrCpooSmRgwaBIPYAVpI0zy28IRJLCyeHzR2U2GMfzCqK+5 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(4744005)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003)(142923001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: zdU1R8uYd5hLbDm/eUTgApasSUoXDYr2Xcl9uw5WzhO9MVbQP2Zv/wVU+5Kubv4jGTc6nMf51Rs5M9j7Mf4VrV19G4RPSszVEeJnhAN6p/IsL6Ggll8/F9bho9SmtjnENy2S4o192EyH7M/fXXTMzv/DLMKmNdaS3iNicXndu+QkF618M1kiYcemUArTGALI9wF6LNCjFlLBJN5UR+LwaAbRNGBU9jgj4PqQK5msQszdfOA/5pO1vl15Zm91c+sdGjo0dde4ZYXRXz5bKm9x9CMx4yW6BtNSN9+e6LrloAh3syslyon2xznsD5wPlCumth8PdB/lCBFoObf0ycYAwufU6NAUZCmiGDko3cRNiRy9FaW/7QBNwOAu/XuEXwmebRip4wMovbWN1EPTEdDbHVsrDxi7bIVIeDc3oUiecHIOVlOtd6kQ7frZDI65smpRwJnTtca+togmtWbD5pGNvGtZMDaGiuutObqlSDVHckoSFbDCP0ODd3A/rktK+TrbhWQWOnNtR/bqfqaquHpluEebiRyoERznPz7lDpv7UShe+rZGE3Y6Bnj3KPuxTliRpxEcCER3R3cH4GfKNz40VL8KlkwBTYoAVZJlwhiZnzX1/rpx62EIVOqPc6corxrXM4vqaPZy7Ol0Wt+H61a88A== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfd072cc-0e1d-4731-5f2d-08d88bec7065 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:48.8254 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nNaQSs4rHNMy7EqMUI0yjePBGxDuRzK18KwXrEWZoDcYUFOu5eTC6mm6uEJbTSPq8cxUAQ/Egay13HI1EMUCa6w1pPTyL7cWd6JnjjY7GUw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.14.135; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:54 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to cancel in-flight requests on mirror nbd target on job cancel. Still nbd is often used not directly but as raw-format child. So, add pass-through handler here. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/raw-format.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/raw-format.c b/block/raw-format.c index 42ec50802b..7717578ed6 100644 --- a/block/raw-format.c +++ b/block/raw-format.c @@ -575,6 +575,11 @@ static const char *const raw_strong_runtime_opts[] = { NULL }; +static void raw_cancel_in_flight(BlockDriverState *bs) +{ + bdrv_cancel_in_flight(bs->file->bs); +} + BlockDriver bdrv_raw = { .format_name = "raw", .instance_size = sizeof(BDRVRawState), @@ -608,6 +613,7 @@ BlockDriver bdrv_raw = { .bdrv_has_zero_init = &raw_has_zero_init, .strong_runtime_opts = raw_strong_runtime_opts, .mutable_opts = mutable_opts, + .bdrv_cancel_in_flight = raw_cancel_in_flight, }; static void bdrv_raw_init(void) From patchwork Wed Nov 18 18:04:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915531 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57FFDA6A for ; Wed, 18 Nov 2020 18:13:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61B4720872 for ; Wed, 18 Nov 2020 18:13:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="VCMOyAR4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61B4720872 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:47768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfRxY-0002ow-A0 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:13:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpI-0004fb-4v; Wed, 18 Nov 2020 13:05:04 -0500 Received: from mail-eopbgr130110.outbound.protection.outlook.com ([40.107.13.110]:34980 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpG-0008Qn-7C; Wed, 18 Nov 2020 13:05:03 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h0KhH2V70l9jpPElIscekX88LZmQ/iRJHzTk/l0kI+/1sw27RbZd6yRxCWUHUGV7Os/2y7g+4zKOzrMtbJlqsYwuD+XRsrlLiYM371iYpwtDgQSRtmpeiLf8OlSsAscS40RrSTJ2nrFgDH2WzENiUblRrsgctqi3mihfdPkDViEKvQLRqdn0deq4MvzCAhj7r6pfnP3W/lh8Lmu+Qebkp3Xs3RCLkVxHLQ6j1lIp4ovx94z02ewiHVOmUs4oWdjsAV620MTTTCpBBC4vE9WvNA+6P2WIwzlpWqwtqSR/C+wrNJ6NR3rp43NCWoUVGSloJXWHDiKLN62DE7hfIvb5WA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KyVCyf9dBHkPWsb7iCHyj5ACQR8Q4wX3ZvLLXdkkwTw=; b=beuncGo3dOqip8NEFgndOueTb8OX4o3Wnn/mmD1hN+o2rbIvxsaDzJ8XMqRYgIHYOwJkjxGna4rTolI1FoKS2SFOsA8+ayBhQ2+/dB3Y/9CPGGlHuBWFi0YpbsriVOq8xyHGV2lnoTs9quMvvohiNbMvrAdfA8Kqmo14UWnvl2IxS4dpBHVFfAb+qq4tm8Da5fTaiytIevT/eOaT5dji3YU9zDJwOLRDr2vJlc5js9ka8SMSCaCz4IDjvUIYbMjWOmEsWvZlZhuGuuegjoVqaUUyhx3oqFRUHE6aOgU5Yt3rCCAZ3wI2Fo174ElBWNjjg/ZbQ4BHTH3pIxsoJ3ukig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KyVCyf9dBHkPWsb7iCHyj5ACQR8Q4wX3ZvLLXdkkwTw=; b=VCMOyAR4vb8Oe7dWPa97Da9eJPOTAecyYucKbTMn0kzcy7WbicanLniAwJBU3Iw7IskXauqTbbiAo5abaZR4+EYFIBI+CetMNEIfeSa92tQJ0bOSqUcvAIy3ZadokjwIIAC7TiU1yK4RQap0HjR+JO92psbBiiIzFFEq7mHW+60= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:51 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:51 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 04/11] job: add .cancel handler for the driver Date: Wed, 18 Nov 2020 21:04:26 +0300 Message-Id: <20201118180433.11931-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04105e27-7f25-4019-3645-08d88bec70df X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:873; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wMQj742xRLdePW7lI23ikQ7fAYVJmb9WNjnwdYo4dhS0ugWHl8I4/gI4dKyW7dHUhySO8KkFEUHc6qSO4V5h1byljZvMSEf3gsiLpI00A2PN+3l0RvK2m5x+JcAEJmhyEotvxTWEKWN9rzolERAGYDS32BxCv5ejZVWXpp+oexbhzSeTr9PrM4Rt1W2SMFI0m4o+0/8n3nZ3w+xAdk2dVf/bJPhX+pGGbnGCeyOAiVYoemYOy27UxmPL3BzieitFfR2AcPvraldR4t1i4n9vp2zmSdY/puPErcG7xqJQEgXhNW2XMIYkSjb+dOS0LAs/fOKJS2w+bgOVatsazAoW0DPG9iLFxTZ/DTg/CVsP6IVcnRgCTkPQCYK4BtkApViC X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003)(142923001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: lgH5xI8JiHgzYQL8B6Oxmt2J8GdcNMK34yqrMXjfVS99Qv2JH5NyLKie5+QS/satyryRY+T3mAGJ4gtwyXPeyJFBmgmYAEIBlFxTmAuVuTyc7cDbB6hiuVggFGtsibVBwcsVAdjd9HRFjZ1LuE5kwSy9k0XKx1MumS6pcWknaCQZG2AN1eBwPQdK5WdXfFMl4GdJzKD4kfU0YITJOBqZelpOyhEIwdvr/pRurQ6BNae5NXzwtpYlVRWWxmOhkfsHM9rChnwdGmer2ezVWt3PUg2vv/baRp8EK0ARF70k7jSXknWhiGCDFydyD4+4UOi5AiA0iclCj1c6rNzMrct9dOvuZWHk/uJvMFZplcyPwxF2UB70FcuELuaFmI8ghQ2cW86UT9DawejdBOcolurRDwby/fDuKmC/D7ZB5PJMZPOcL5cLqnxKDK9CMZMR1hfxjz0MThQ1QerImdWTvRD/kkziXaBA/YwXPU8r8UEoyXQ8FoDYMkC1WiyX2gZzArZ2u8Gz7GoFkrTb+AIIvqeICHAOXFHA4CyR6/I9GDE0FJ1i/Afeso7QvT4SoJ+TfX8CFDs8W2d/hOSLluaG1SXllsCy0PBaSdXnqcZxvD1cIuN4illLqghySSwoH6N4ZetcyBHzvxNI9Ej4r46I2Tax+Q== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 04105e27-7f25-4019-3645-08d88bec70df X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:49.6349 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /NN2zsUrkcw/6H0fjXyQQCZHAeSaiHQLCht8hF7pMZxMM/GA6HAMqkADybypjjG+ihRnmuTn7OHiwtpeYiB3AO3AQ1YtijNix0JWr6CYkr4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.13.110; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:46 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" To be used in mirror in the following commit to cancel in-flight io on target to not waste the time. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/qemu/job.h | 5 +++++ job.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/include/qemu/job.h b/include/qemu/job.h index 32aabb1c60..efc6fa7544 100644 --- a/include/qemu/job.h +++ b/include/qemu/job.h @@ -251,6 +251,11 @@ struct JobDriver { */ void (*clean)(Job *job); + /** + * If the callback is not NULL, it will be invoked in job_cancel_async + */ + void (*cancel)(Job *job); + /** Called when the job is freed */ void (*free)(Job *job); diff --git a/job.c b/job.c index 8fecf38960..65012dbd03 100644 --- a/job.c +++ b/job.c @@ -712,6 +712,9 @@ static int job_finalize_single(Job *job) static void job_cancel_async(Job *job, bool force) { + if (job->driver->cancel) { + job->driver->cancel(job); + } if (job->user_paused) { /* Do not call job_enter here, the caller will handle it. */ if (job->driver->user_resume) { From patchwork Wed Nov 18 18:04:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915539 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5C1A5A6A for ; Wed, 18 Nov 2020 18:18:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BE12924248 for ; Wed, 18 Nov 2020 18:17:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="Df1/4WLv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE12924248 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfS1m-0006lw-Kp for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:17:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpK-0004ho-69; Wed, 18 Nov 2020 13:05:06 -0500 Received: from mail-eopbgr140135.outbound.protection.outlook.com ([40.107.14.135]:60229 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpH-0008Rp-PK; Wed, 18 Nov 2020 13:05:05 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m34FTglYwjD04GQEEtwEByE/yACPkDiGNywMwjwDNVPjLy/SbfNzvTUgR1doT0j+xilPRUs59Ygu/1mzj3JmK3IbTyRX7w9QfLA1bYQR2bYKuOM7x9kzHp82lRazZ1bla2WazOto1M5urrdheliYO7Rkw/WJRCSVjABHOCAcviUs4OToIwFUMOMH4dqQPMduiqllyLJRjIMDspck9x5ZxAXwdWPaMrSYY3wbD0bH6sp8d6XkRHqdehZEkcPzPKu6bfgytYUEFhidcG3vvnjviEUrDVk0LvOmE/2Au7miPVVO433QH6g1Kx+6gi600tRIpAWmbA26fAty3FyM7mj9KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2Jgh+v0Hxi2FekA58f7XruGGO6zqj5hJ0EV9Wif4Fnk=; b=ADDGDNVtxV4BVfRFJtyOD55LpcIMYOYXHFCDGuWWkQC8GTof1AemeumephAJRK6aKLVzmV+1qVcRzltC698HUXUFsDV9g0G1XlUBecwvgYz8AJE+uUL4ZKAzVmeJGsy5W35iCm4sWNUBP/FSRK0YWURAK5YzMbQhmi57QhcwYP1RxCTV4WjumUfgOGoq6KMICvStNo+OoiDGlZhcX4ORTYj8SPGhWGpHek3gER1MUXcw4vQ3wr+aGGrFzg5KnXSU2n/JopFo+CWrkVkeKU/f2FYfRsWbu1TBkx9WMloH8jzePFzyvu4LkFj+Pp+94sqzWu7uWlT2lALSc/87OV6b1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2Jgh+v0Hxi2FekA58f7XruGGO6zqj5hJ0EV9Wif4Fnk=; b=Df1/4WLvpT35jQqrI7P9nFWd3VfyB3BCALNUPnjSaAbR00ULUY9PunLDr/S+nO8qEXV/am7t0US7AF5MI2/5MC5Uvs8GLUid1uZtSfAuevNJFQVN3YW/5upAkqFHwr7AMftAq+lgT+oCRKOWinjWSwpHDUi6LlPgmawmH2gkuPw= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:51 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:51 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 05/11] block/mirror: implement .cancel job handler Date: Wed, 18 Nov 2020 21:04:27 +0300 Message-Id: <20201118180433.11931-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ccc3f9ef-fe5f-4b52-d9af-08d88bec715c X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:514; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ASQhDQu2VIj8FhN/1UzMDI6ASZRc5W4yQRucHcspOWsDopP4mLW4xI5nviX4QPf6LfvSO6HpWCX6zRdJYoU5/cxRcuqYadmf2P7UFugSPJcSO0WZfI3acpWh/CtlnNel5IAh9krkh0sElVirAx8jKzEWfQsVwu1mlg3wFU2u7bfjIL9RFcQ9ikr0A+zZZDCIa+nngv7MgEkfQGUZrT9mqaPIarRonL8MaUCW4Cn7mMlnKP0U2QqYWTE1UuzjPUYKs8FLUYKOXZGOYtEMaTnw45YrmEjSWV3JizrxvvRBGID7q3dWX95QTxi2V89MtwWpbNaXpoqx0Mc7ZD1Nw+1Ee7Zd/jEacTK/4cZUzSJY5Epxj/aWh+to0UgMnmlhAjASPaDhpRqpcJJq+izUDnj2ow== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(4744005)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003)(142923001)(309714004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: XLdv6oQ7lCdqh3c+0Oz/KcKZ1wCu+Fkty14CCgiDI8pqzvDFG7Q2lCeHRgHB2tslNDHng/kpQTN4wh29ftsOc1pupga7JzolZTEwwDXkwcBcIyjcz4Dr/OZSNuGV3FdyiMQWWv7EFWnAuYNu/NVLRAvLSVdVZqK5DDbhiUFvGl9/ukdxf3PXTlb571XttRB2GI4PDcDsEDU1e1dUkCSOtjLa3VJI+MYaxulebbhLRoCFfp1jzvof8p8WS3MXXvQcyjd1L38erZAAW/W+1ipOoUi98F4p/ztXtcWa+ft4lx4p0ql7CMGhX3XKB5MYnBUsMbAoq1DtDPssKLDi9UNvvGwNH2sJjz3glPy9C5f6AwUQeeGNjQ1Kmqaam98Qhjymc7I/2OffHS3Y/tr/AVEdbyrbrl5vAwhZ5UH7P9n/CcP+dZ9T4cReFtMQMonJPs+dbqGzpK7janBr1oNwDnzdfqh786X3r4DcfDQ5WknALoU5E+b0a7JgFDDUGJNfidt8I2bLtc6FcqrECaBH3qi09NJEO9ILg+EKeS8KFZSq4EzQwaTtc8Vp6nlDI4rQeEE+gHDOgwqJmnHQ7im3GmYkHHnzBFYicr7bJrZ2N31W5cYNnygzDTPxZUgsPSgwctyf6+8UsgpFvFkE7vAiSE5Z7A== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ccc3f9ef-fe5f-4b52-d9af-08d88bec715c X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:50.4772 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1jg4ymjTvioXFAjpwO200o0aZOra2PCkVoWkzXeCbH5vjNA4P3KxE/ODEg66gh6j27NJHg5wkamI2WTQK+kS6FjI++3y47faJCrDYhhTQAM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.14.135; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:54 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Cancel in-flight io on target to not waste the time. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/mirror.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/block/mirror.c b/block/mirror.c index 8e1ad6eceb..9faffe4707 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1179,6 +1179,14 @@ static bool mirror_drained_poll(BlockJob *job) return !!s->in_flight; } +static void mirror_cancel(Job *job) +{ + MirrorBlockJob *s = container_of(job, MirrorBlockJob, common.job); + BlockDriverState *target = blk_bs(s->target); + + bdrv_cancel_in_flight(target); +} + static const BlockJobDriver mirror_job_driver = { .job_driver = { .instance_size = sizeof(MirrorBlockJob), @@ -1190,6 +1198,7 @@ static const BlockJobDriver mirror_job_driver = { .abort = mirror_abort, .pause = mirror_pause, .complete = mirror_complete, + .cancel = mirror_cancel, }, .drained_poll = mirror_drained_poll, }; From patchwork Wed Nov 18 18:04:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915553 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EB00914C0 for ; Wed, 18 Nov 2020 18:25:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65059246B0 for ; Wed, 18 Nov 2020 18:25:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="SD255RLU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65059246B0 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:41574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfS8h-000406-1Y for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:25:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpL-0004i5-3t; Wed, 18 Nov 2020 13:05:13 -0500 Received: from mail-eopbgr130110.outbound.protection.outlook.com ([40.107.13.110]:34980 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpI-0008Qn-Q5; Wed, 18 Nov 2020 13:05:06 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T9LFQsM3KJDc3BEW23QPoBGsMVsJUzzaUMgXTD4CLdWFL/UZO9NbgOe4fYSOgqsjGPbk+y2KENJn4jtsrARtq5cieeySu/zHKLBErbOW97wXYHJeOzSNVzhMYbRS6oe1ddwJy8DmAGAeCVs0vHqlzViYnSYmMwaOZV1OktZiLe8SXEqBlBpqcHAMg88OIS3EkXZjd5yY+UtiuKtkz8gl3/vav/MZDMONwrPi3pz77kgbpMpHMsm0vLFfrrDiMwx5ReRhsFqAEuJHb0qwi6xVs+srSBzf/dtNVtwPLzlYL8yjNgaeRmR6ac5vb1+BnsrRA6sBlKqT+V4PNsmjmqfiZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PPjt0kInIECsQgGe/qcum92Xm09EG7DNn3GWRUibcig=; b=Mqc77g0U5WRQwMejUvjoH5zpnBxfRuaB+AIN52VnqXu6Fm5cP56NGFJr646tDSl2d5m/QX3hpraXRwRr2Bbd5UwuakDYRjEhiBpLQu1wViubuDOjgsOqzw0AFwpFniXle/JSJdEoMwhu2VteH8eRVvEeiFzSflsxRPAe6LP9xuwsj2ANMGk6uMiNNu3jypw4pkY92B+SoxOUz9JEARduLtUn+F4qvkcYL1UBkujz+qlGZupGW27yBkdpkKZWhRvpSnSw8sBzCSyBASaASzWaEnqzqLTu3nZzAVVZyKfKCP6avKyKjuuQgbrIRTsooqyeY2cv68RFNHm01pJGdxOI7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PPjt0kInIECsQgGe/qcum92Xm09EG7DNn3GWRUibcig=; b=SD255RLUy4uuxheqbN7jLhwmmpZKEgcyI1wrBxshu/CbSWPBv7YunTDK9bw6Z+99RauoLDNvpOZh9lQkg4zGewfH3N6ViQeB6Umj0hQ2VCbP9vXfnlwY3fidyU2R7Oy2KS1VKAXy7sJ7jnETeRr27MyEaNFJdJaLlEPVJlnXPoY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:51 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:51 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 06/11] iotests/264: fix style Date: Wed, 18 Nov 2020 21:04:28 +0300 Message-Id: <20201118180433.11931-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 152eb984-d6b0-4af2-86f0-08d88bec71dd X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1122; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TcvRa4GxIjlWH6xokOH6vBweV5HSIacB6btujowAOmxbvl2Ib95SyoOGMUSdBgDUNgZInmMfkLZRUBAoMSl1gqJKSszZ1YxBdZuSbaJ2McWmOyYURjNuErY0rYkuuUiDuq9b8UeqjbWj7dLIHErBrHg6Fjy1j57BjSzx7rGc/YWqnEy3/fmDAakVgNnTN2hjOzl+REtLnwXECW1FRxMr5MkoYoDLCO0t0llsHh1yNcJUJlyJuYfSn6iwMAAOLCMcUoW9rwohkSmyh0m/FbK5TmxS/NURpEvR02N3vZIIDuWhoSg7hZcwb+/UFxSVxbPmvoWLJxjCPrHEBjdcVtTVgdei9nZa9jdTPf/RdQEgUKtMdbWZbdqDj4aDQEQtvN1v X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003)(33290500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: zEYso+7dW4QaD16O9uACw+dspYSnBfTZIfohHdxncMj+uAh1JC+PnId1j6RGNeD95DyI3v0yH5hMtLj3T37+3lWMGjpWdeTDuhvUQ4N+NYSvyZBtPU+yCM1fN2XDQcA7T9F53rAANQEKmOPy80fnFnQw8Ym7uxOreNEMvQCALAsAg7d3m03XCLh5zJ2O4ES7XHh8EJaRqXDLVPsYunLDXYOsAq+6RlM/DqkGqHDpduxz9WCIW2MeVkhpxyQmoYi35OX4IwzeGwL6RVuFUR9YjIRas22XuzG9LxtzYAVSQT7tViUgh6JsaB+ccI+j0/bk00eJqnT+IDCDNBY69W2XmxlFdS9Os5JtnuRVUMkIwAVdZhtKX+7a4Nz7GwnYybeZXPP4Hz/rduPXreCMVqxoERST6hnmQYUrU3bRukoAE2VM4zWcWJIE80A+nIEtkVimp2igriNnWNSGZxOU91k5XUtelasnhQmiMuW66BFYcbJaiz5M57sVsRa+0hVVcx7K6XODtunilBEgb2SNr5ZmCZVX9RSJQIKiWiaOdVE+y7XTYyplcsG4IbpTvWEYr6ACgb/T9C6cGkTW03aQcWFEodWs0nZ9RsCxv0AfpWY31mrw8ema/BKwqZfo9tpD+orx+p67popTeUXwl2tvEy55ZA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 152eb984-d6b0-4af2-86f0-08d88bec71dd X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:51.3304 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xTxc3nAZZjYi8Neexj0DKD88jLJjf8o8IBpvPUSAmVwsoKEzh8OzTocSgsK6Nl1WJ9yJjuoM0GyKZLsH60+WPcyoKWiC8bYl3ToR089k+Zg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.13.110; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:46 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Fix long line, extra import and one mypy complaint about incompatible int and float. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/264 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index 666f164ed8..0e8b213657 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -21,8 +21,7 @@ import time import iotests -from iotests import qemu_img_create, qemu_io_silent_check, file_path, \ - qemu_nbd_popen, log +from iotests import qemu_img_create, file_path, qemu_nbd_popen, log iotests.script_initialize( supported_fmts=['qcow2'], @@ -31,7 +30,7 @@ iotests.script_initialize( disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock') nbd_uri = 'nbd+unix:///?socket=' + nbd_sock size = 5 * 1024 * 1024 -wait_limit = 3 +wait_limit = 3.0 wait_step = 0.2 qemu_img_create('-f', iotests.imgfmt, disk_a, str(size)) @@ -48,11 +47,11 @@ with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b): 'file': {'driver': 'nbd', 'server': {'type': 'unix', 'path': nbd_sock}, 'reconnect-delay': 10}}) - vm.qmp_log('blockdev-backup', device='drive0', sync='full', target='backup0', - speed=(1 * 1024 * 1024)) + vm.qmp_log('blockdev-backup', device='drive0', sync='full', + target='backup0', speed=(1 * 1024 * 1024)) # Wait for some progress - t = 0 + t = 0.0 while t < wait_limit: jobs = vm.qmp('query-block-jobs')['return'] if jobs and jobs[0]['offset'] > 0: From patchwork Wed Nov 18 18:04:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915541 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7ED8714C0 for ; Wed, 18 Nov 2020 18:18:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB50924248 for ; Wed, 18 Nov 2020 18:18:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="jOTkhsnW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AB50924248 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:58662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfS2K-0007UO-85 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:18:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51908) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpW-0004ke-He; Wed, 18 Nov 2020 13:05:23 -0500 Received: from mail-eopbgr140135.outbound.protection.outlook.com ([40.107.14.135]:60229 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpK-0008Rp-QR; Wed, 18 Nov 2020 13:05:18 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EYq5FmzP25cMio1q01V08fNB0/XYXlu/5YNiIuD5agmX0XubQixU+v/Qiz21zDu3Fe0JzLjnREplqdVbs0hhbZssi7YhCqFGiyf7iYiN8c3H1a3gVx5nGTmnl4rBo7Wlt4BUHzNsdSdY8Q2jq/YPSua8412Xn+iS/IrBLPcQvusJAPZwmFXSH6GNoPFGL5t0svVbVxBWqPNpF49XQ7sa1bj8tnOZW6LDgZSXIlLNCUmy7OV0XG7T9wKcH9+mAcM5ShxRhZ76L7A/D8OcVgb1bxWcOtdeImGiH998P8J1HkkU5dGzFn+ANTmDspN7jUXnmCi5hb/0U1EmFGnj0X+tSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=myxHsX+SpXCtoHU4M9bq7h9RTSwhY8RziHIURbEsyrs=; b=GgbPe7JppqMSNm5DVa3lMzmzYw0KGdLBjTag8/tzx+5MGmwNcHRrRnWlIoWemz2D8pfNqqBHcN/FNBcHgQxpKv5oAljZDWzofWh1HSd6h7VkJZxHKw2IokZLloPDt3rPGLBQl6jrupd2h3sQjalJdP21XEnUp1W2aNA34RqOJ0/cNvNspiohfPSxxKPC4pVDRLhzOed8+lJrntPN7YiSSp5/oeFglugGM6/+ent9WB80zMRHIdMf9jp+ipNiJVlOkYtyrP6okSjO+o0EPhibyuh3EjglX17O0pxl+3LjNoawD4aNPAPnv9EcFzjlFcgAT0L06qIUMGKl36SMPyT92Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=myxHsX+SpXCtoHU4M9bq7h9RTSwhY8RziHIURbEsyrs=; b=jOTkhsnWrzHdYusvS4Komk91CLb9OpnCAhfuZCSdITseQF1QjwhQVHbdQF6wtliw+1VHVS27y0kaoQ1e78S3irUuyVI1yoPJMWxlW9LjmXql88n4swK/IphfXyiJxPKKNJiIbnMsUPoenPta6Ec1/MLS8F5WcnXWSwjNywaZpSs= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:52 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:52 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 07/11] iotests/264: move to python unittest Date: Wed, 18 Nov 2020 21:04:29 +0300 Message-Id: <20201118180433.11931-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b0d2be1a-da83-471f-3df4-08d88bec7261 X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: roe+46w5Va7/VIjVnYvADET/HF7VWZNlrqCjvzDLJJoiSh/fe4AsdlpwGOC6DzNxxwlZk4XSSQytCyhWuWaOevuFyVEn6t+LwUs5HoketCSCgWyglVox8M92Hoy4oxw6KP+k91mgAegRCMEp5GkUtxVChdsoXPGpbV2Kqkf/FEXA5BzLliK24SQpl3EFELDwVSHqTGQgI+wQc1pNJkGPfsfotWV7CK9CvQJoh7bDZdjq4dsnsrBKFL/uMYcnf/22Tyw7JeCTk83Vyj2C7qv+5dPJMPahskvDbaiUqwcyvN4fEtwhtx2ZZ9jR9LhMr6PqEyVx34yh+c6rkKlWoX3LYoO2DH/ZHVx3mI3W/xmcTsr+jLheykSh+l8A+yf0L+a7 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003)(33290500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 9Z05vc5TLUXLy0aTuKCIMNIknC0TlYTuVjnDRNHd6/JOTtT44Dj8L3rb8YfQ3eJJD/Pa605aY8PgEDqxYfayNbqICLR6sdwCeEmNsePoN93CSVjXdU+rUcCsFzWnqa6Af06Wqj3KXv/bm2Comw05Ysv7Cbw1fV1OB8/DHOBD1ma38e/R1s7iGjoTUniKz56jZALpfcGA9Sp1zQU8T6fmMZkF0+2xbnP5d28+3Omkb/2hmHbkosyDy8JP8Pkj4QYFv1kVdnzWQqY50v0ULhSdrJbwu0yqIg5l0P3kTyfVJm/aczus8R7gyaOGt9dFNA/xs++aqvrRf8NBg3c02QXN/4YOru89SoPHz7xlYL66pRWHPzERZnqFY/3sF1/Htzhdd0sMonqNKMG357w4b1jGOWKe9UW7ZBdDDsAUVyEvh4BkZrL1LNz5X4ns1Hg/J37caiVf1vcmkQg2QgeIwvUCr4HgFYB/kBtVN8kTBwjZN3cTd3D1gVPrKHSHTycI2SUNNeynPiOa6mtb551sMl32H5C1YAT7v6W+vWJF7AA29LIACPm7iCMLUHj/ud91K0yYRCgZNswnRlBQ+Vvythx3q3yiJOTDaj7ui8rq5MFGB9GL+L8VbC+nZjNK1OdmxI/BjopVvITq1Wz2lgLQEK07AQ== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0d2be1a-da83-471f-3df4-08d88bec7261 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:52.1807 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4fXYBt3rc3BsZ8eyVIrjIkFeLCKpzzvEJV5botLrYgAdplSGiHb0Zm4ZFeu21PuE6LLXtgoZpg4RDW6vHWYBaRbHPFTxMZAM1jx8vBViB6s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.14.135; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:54 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" We are going to add more test cases, so use the library supporting test cases. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/264 | 93 ++++++++++++++++++++++---------------- tests/qemu-iotests/264.out | 20 ++------ 2 files changed, 58 insertions(+), 55 deletions(-) diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index 0e8b213657..8c61628921 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -19,13 +19,10 @@ # import time +import os import iotests -from iotests import qemu_img_create, file_path, qemu_nbd_popen, log - -iotests.script_initialize( - supported_fmts=['qcow2'], -) +from iotests import qemu_img_create, file_path, qemu_nbd_popen disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock') nbd_uri = 'nbd+unix:///?socket=' + nbd_sock @@ -33,46 +30,62 @@ size = 5 * 1024 * 1024 wait_limit = 3.0 wait_step = 0.2 -qemu_img_create('-f', iotests.imgfmt, disk_a, str(size)) -qemu_img_create('-f', iotests.imgfmt, disk_b, str(size)) -with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b): - vm = iotests.VM().add_drive(disk_a) - vm.launch() - vm.hmp_qemu_io('drive0', 'write 0 {}'.format(size)) +class TestNbdReconnect(iotests.QMPTestCase): + def setUp(self): + qemu_img_create('-f', iotests.imgfmt, disk_a, str(size)) + qemu_img_create('-f', iotests.imgfmt, disk_b, str(size)) + self.vm = iotests.VM().add_drive(disk_a) + self.vm.launch() + self.vm.hmp_qemu_io('drive0', 'write 0 {}'.format(size)) + + def tearDown(self): + self.vm.shutdown() + os.remove(disk_a) + os.remove(disk_b) + + def test(self): + with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b): + result = self.vm.qmp('blockdev-add', + **{'node_name': 'backup0', + 'driver': 'raw', + 'file': {'driver': 'nbd', + 'server': {'type': 'unix', + 'path': nbd_sock}, + 'reconnect-delay': 10}}) + self.assert_qmp(result, 'return', {}) + result = self.vm.qmp('blockdev-backup', device='drive0', + sync='full', target='backup0', + speed=(1 * 1024 * 1024)) + self.assert_qmp(result, 'return', {}) + + # Wait for some progress + t = 0.0 + while t < wait_limit: + jobs = self.vm.qmp('query-block-jobs')['return'] + if jobs and jobs[0]['offset'] > 0: + break + time.sleep(wait_step) + t += wait_step - vm.qmp_log('blockdev-add', filters=[iotests.filter_qmp_testfiles], - **{'node_name': 'backup0', - 'driver': 'raw', - 'file': {'driver': 'nbd', - 'server': {'type': 'unix', 'path': nbd_sock}, - 'reconnect-delay': 10}}) - vm.qmp_log('blockdev-backup', device='drive0', sync='full', - target='backup0', speed=(1 * 1024 * 1024)) + self.assertTrue(jobs and jobs[0]['offset'] > 0) # job started - # Wait for some progress - t = 0.0 - while t < wait_limit: - jobs = vm.qmp('query-block-jobs')['return'] - if jobs and jobs[0]['offset'] > 0: - break - time.sleep(wait_step) - t += wait_step + jobs = self.vm.qmp('query-block-jobs')['return'] + # Check that job is still in progress + self.assertTrue(jobs and jobs[0]['offset'] < jobs[0]['len']) - if jobs and jobs[0]['offset'] > 0: - log('Backup job is started') + result = self.vm.qmp('block-job-set-speed', device='drive0', speed=0) + self.assert_qmp(result, 'return', {}) -jobs = vm.qmp('query-block-jobs')['return'] -if jobs and jobs[0]['offset'] < jobs[0]['len']: - log('Backup job is still in progress') + # Emulate server down time for 1 second + time.sleep(1) -vm.qmp_log('block-job-set-speed', device='drive0', speed=0) + with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b): + e = self.vm.event_wait('BLOCK_JOB_COMPLETED') + self.assertEqual(e['data']['offset'], size) + result = self.vm.qmp('blockdev-del', node_name='backup0') + self.assert_qmp(result, 'return', {}) -# Emulate server down time for 1 second -time.sleep(1) -with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b): - e = vm.event_wait('BLOCK_JOB_COMPLETED') - log('Backup completed: {}'.format(e['data']['offset'])) - vm.qmp_log('blockdev-del', node_name='backup0') - vm.shutdown() +if __name__ == '__main__': + iotests.main(supported_fmts=['qcow2']) diff --git a/tests/qemu-iotests/264.out b/tests/qemu-iotests/264.out index c45b1e81ef..ae1213e6f8 100644 --- a/tests/qemu-iotests/264.out +++ b/tests/qemu-iotests/264.out @@ -1,15 +1,5 @@ -Start NBD server -{"execute": "blockdev-add", "arguments": {"driver": "raw", "file": {"driver": "nbd", "reconnect-delay": 10, "server": {"path": "TEST_DIR/PID-nbd-sock", "type": "unix"}}, "node-name": "backup0"}} -{"return": {}} -{"execute": "blockdev-backup", "arguments": {"device": "drive0", "speed": 1048576, "sync": "full", "target": "backup0"}} -{"return": {}} -Backup job is started -Kill NBD server -Backup job is still in progress -{"execute": "block-job-set-speed", "arguments": {"device": "drive0", "speed": 0}} -{"return": {}} -Start NBD server -Backup completed: 5242880 -{"execute": "blockdev-del", "arguments": {"node-name": "backup0"}} -{"return": {}} -Kill NBD server +. +---------------------------------------------------------------------- +Ran 1 tests + +OK From patchwork Wed Nov 18 18:04:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915551 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 94D36A6A for ; Wed, 18 Nov 2020 18:23:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0BAB6208FE for ; Wed, 18 Nov 2020 18:23:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="t0QuFftC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0BAB6208FE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:38914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfS7D-0002px-RQ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:23:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpe-0004mP-35; Wed, 18 Nov 2020 13:05:28 -0500 Received: from mail-eopbgr130110.outbound.protection.outlook.com ([40.107.13.110]:34980 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpW-0008Qn-L8; Wed, 18 Nov 2020 13:05:25 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gSNOisMkxTBZCYboqT0dxZ0C6y6ztriSaXa9/YPw1bEqEEfBFf0vvsMhJuImAVshElfALp2mYlju/3TMCVk1+a00iqaJeWpOYS8Rwon81o94T/viect9oHz2mjDALvkOYF5C9332XRC5NZWkbfrONSh+LbBlyuIYQCiv5JvtxUoaqYALFJotChjx64MD+AEEatSBjTr0yKbAa7ivDR1mbE9sZ7lc13IuvQaSgFYxbmMDXqWknL0wjpd6NHj946TadHbFAObIWpCHdrRWSKa+xmMot3nVllwnJr14tj6gIQy8xbzRyzHHsuSZKKhfHXgUQWrvZDunVEN4Fq6FqXdQzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=znpnMVQZieCVYtPB5nhu8lS3VKd3OkTMwhoturtWpx8=; b=QUhhISP1D7UB159PiOpjFV11RcNXgAW0/JRHH7dj7qU2GIEX+R1W2WmsJH+Uixcta8GQIt8YtO5QU5QrAt0LEKtcTfSqvEdti8vojD+zG1h7vErdALH3NygVNcae65IfdZ69HhI1mzQiczCpHfW+JHY0X6F4z/2wDcodemzhtV8RVzmjUbwGw71v4l4YkiFlUj9CVhkyBbbyh2iQ2OZLKMqFUs2Tb0jSOSPayTgRGZ9KmvbLOEEul3qRxsbj8EgqWSAd9JSPfbrBtxckESgBsFDfns6wZ0fhGTdBzo/TQMjnOvhn8awPSe5p91O2wVEQazuvL85X6iGCh3XQQ2Jj/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=znpnMVQZieCVYtPB5nhu8lS3VKd3OkTMwhoturtWpx8=; b=t0QuFftCWmcqcTICjtWhdLkM3nR5sPKBsDBC+vByy8m2h1gqU97Is0AXgnRsGwMkQKgdXFjTTzmO7XTAlsldXhBh2/F2Zigo25ZFlvMtNcUxdIJgpl1Rv8vLpqfWQd0TceYGcfZSxPoKow9azhH98xTVdnGtdSi3yghByV10o7Q= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:53 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:53 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 08/11] iotests.py: qemu_nbd_popen: remove pid file after use Date: Wed, 18 Nov 2020 21:04:30 +0300 Message-Id: <20201118180433.11931-9-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe8184a6-716a-43a9-6cae-08d88bec72de X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:111; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZJUBAW3UzSXWRx72z6vjEvQCSNcixWgAl4Us1/JzxNlPJ5eRAdGepWf5pb6NfXTYUWnbOx8jPf+4dkxBym/FXnQIIrQ6b2phE1SAP8bT49E/vhaQyIXdCZ/JA99DkLaHAQhywCIrTRRB12p/0xhhOW6Y9B1v6W2iRof/QVdbHfYw8eqnFS+rizt/hqVPBoYZCgmsQfwTa5UlKrWjtu7XzGfuDZu0HZWLERxBBjtiqYfX2wrflcuMATRje3KrPYK/vKvlfb+2xX6W5blVQApHoMm60X95dgEVj/lV+2pwo4tMt3vI9z4s/c6c6VCwLVlNjYHJ7Z5+KFnMuiJF1Ipcag== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(4744005)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 73SCGAA3dH4hrkKFpxkq5jL7hlAVGXWsCFAPMmQoiodvcbINPSa1DYXQQA6DKRU2L2/1GUf3DDHPMwJFaYDi3KCjNJz6U3Ep5w3bmJoM9ulqbCxY2UXUDP4afkgJvkIZKplLclCjw+cHtJaNgVXmaRZVQjCetqOEy8RrStKUcx6i6HZiSVFX+tAU0d1jBsyn757E33JWt5gywUUKAiDjBrrq6vcVx8mT1wtzS2wEm8igYNBhufBC/IxZBHM2by3xJ1yWyALhzNziYWjd7x9UU0RpSNabHSYmgGdD4JDchnIUDgfcHssBgryrplEUxk/2TUvml1TWStlS2ltw4zYqENP/HPG3mr7dGqIsg7nOLhnM95uj4O7ksPlAlsROItrl7yC25v1LP5EI0A830jHfQk6ox94hkzdBV1w9soQMGvHwzJ0OWq+cB4f9e6nHZq4sqWVhDX5s3bPl6c3qbIKNjROXK4HTk0E1JuEWPq3fNrNjWOVviYqAll29Nxang1hrhy3TgxHfExqJxniCQs+7Cav3+AvkZ0LSHw8HxoStYzIras7gpPORfznIqNnTCwwbrflCkDjFVDWPK6nwIticPgA1dk0SlKlnLQ5yhiLg7HLqh2tyo5dGnvwKQQa/r8xXTKi+1zcpndKDJ4ut9Sbw5A== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe8184a6-716a-43a9-6cae-08d88bec72de X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:53.0738 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HBHg0H2TeJJs6288kKqDdC8GHeTehDn6RJ3+5c+f5SX0fYOLRLk+b3vBuFWClleJjgSJFXZTrq62UA9PNsQxlH2UX+xo7dUkeoZo8Vz7i/Y= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.13.110; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:46 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" To note interfere with other qemu_nbd_popen() calls in same test. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/iotests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index bcd4fe5b6f..6df280a97e 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -291,7 +291,9 @@ def qemu_nbd_list_log(*args: str) -> str: @contextmanager def qemu_nbd_popen(*args): '''Context manager running qemu-nbd within the context''' - pid_file = file_path("pid") + pid_file = file_path("qemu_nbd_popen-nbd-pid-file") + + assert not os.path.exists(pid_file) cmd = list(qemu_nbd_args) cmd.extend(('--persistent', '--pid-file', pid_file)) @@ -309,6 +311,8 @@ def qemu_nbd_popen(*args): time.sleep(0.01) yield finally: + if os.path.exists(pid_file): + os.remove(pid_file) log('Kill NBD server') p.kill() p.wait() From patchwork Wed Nov 18 18:04:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915561 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC522A6A for ; Wed, 18 Nov 2020 18:29:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 54DE220888 for ; Wed, 18 Nov 2020 18:29:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="TBx67zmt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 54DE220888 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfSCT-0006wh-8b for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:29:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpg-0004mc-Cq; Wed, 18 Nov 2020 13:05:30 -0500 Received: from mail-eopbgr140135.outbound.protection.outlook.com ([40.107.14.135]:60229 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpZ-0008Rp-NX; Wed, 18 Nov 2020 13:05:27 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NwACOA65poDnESxsElF5u2joQj7gSnvzrXkwWIqdq/TfQ6KBiNBAk0Lxsjt7VaC1XXPJSpKN1+xlcbtMOaBzsd0+q087XVlXfS/iR9mSwpWFzq1UfpSsAn97eh/5NREIlRPP7r6nT+Cs98TNB2H9h2sqR7laJ5qpBXLX0iEQgigUSmVOvQx03MSanMvUwoiX+43n5yLGVxEYUdnAFrGx3OsOCi/eEE0OZsXyHU30JJSDt3HsjVbdef3zguDCfD9bk27pQF9TCXazuOhTzyxDyhZTQX5njB/YCNWYg3IneIggz4XB1S++vMmuB4XDrgsOZoiRLHmyUMoEmPIzSjBlsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sPMOpEZ2f2ZkOmg59xGaiof8g7i27v2VaWcQiP7MnbQ=; b=aSQWxw6TF/2dRSRCTbTWHRAJQFymUEaaQUtwpoajIS5vp9ypXko2FNEn8mIfyLmM/yT4o24SW+bnRtEIH+ngaZ1jEytWXPkoa7VxSsPLZbghDZhoMQHauc4Zi78aWGqezDHycquapifxu76+6W607MZp/2ZCNZErGfKj3ilk47y0DOI/q5EQ7HlQdFhXTOi3+FZtFeUgRAapzwDP9Q1MvLWJmLNawNPxJBw/5+ZRa/olRR1mEPQ/BMg0duRnHQCSXjBqiSzTAYHcKFThzMPuBntj8LM3WEfl/3kwRiP3r18DF5vS1FempqHl2erVFeNWir69NEiFFWUvQfaF0h03lw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sPMOpEZ2f2ZkOmg59xGaiof8g7i27v2VaWcQiP7MnbQ=; b=TBx67zmtLtU+0z2C8qr7nvEbkZkHqAiP/AXU35ylP5clgBsXYBwhq/BBqeQ+fVx0YfMqkH5WbnBxjcTGWgjBH7gxaYe0KRu7bKvxgSgPkq2s2lbAvXLM5bSPDhvACGf9TMJM76D9RjbthHFltAboEEHLGzQBheJCSYI88dKD8z4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:53 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:53 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 09/11] iotests/264: add mirror-cancel test-case Date: Wed, 18 Nov 2020 21:04:31 +0300 Message-Id: <20201118180433.11931-10-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2bb16074-2c3f-4ad2-7860-08d88bec736c X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:172; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 036xV1eYkEuE7BW4cIeZdEMVKwCfNYyIteYCurzBJsS7n4mZ5PYJjHRhUc5MuzHPo5/iaaKmgmi3FrUafSlDxK1CCRRx+5qPIpmEe6U6aO3DszDpEWWVTUDa6w2KwK8Biawy63sy98A4D7/yCOli+rPh7gjG+tBLMk4wki3+GjWMoDngfsarY7NDvf3aIUzdjYS4rhlyj+3cXxiYDCJiARWPO5dORRC2uCHmY5EBSrw0P3s9etnpoyCVHy5LZnvTP9rhy72pidJeDmJFpBpkkMts/IFEtaMsicl1LlckdGl1K8sHElA3+pv6gauCfLeeHkW3G2RwUNWTAT6Crq/bdyVPgZ1bCl0PD95+nqFd1P/Jmggyjo3HO49Yjkir+BB8 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003)(33290500001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: IJHnFNTNr5GdQ73EZXwNBZCYUVup/hB0XSmgeuhHwvt6egKPfl4miJWS5yCZS6IYo0BPpbC50YP41p+cwK1MVel9wDcorLlXA4qze3zqpwMBa3SClt38G/7YPfJnQqWlvNQ0xyDp8C6KBYz9RrUQ5VQq589ihuW9ZcEPG68LigXcMT6jgfqvr8WoFtAG4ILDzxpaV4WXldy8Zr9jRvlY5O5KIipPElVIuaKP5knpvitwSXiWisGah7ZTN0eOjVPoXgSfrkVtslfJtY3JLHMf8hzMC0gkIHV3FQ0EPBYPPPireCTAT3+6RWtChNc2fIid7weYpRf1HGlzDkYCcEWta7c5YIoH+cprm/fhJxQqXtT+nGqWA8bRU1LLVZKWbQrvuie6bQXcy9ldBzUDhdG4AndJHVAMpx8zYi4ibhWMH6G1zJSdmRBKB5uk9kK+oRWXlkx3FU415m3X/IOQ5X6HTfgoAuunvW8FO5KqJgOf35hAyQgGgezlB4PjjeVtN71KFglt8n1uTcb07SJvuVv3vJSVeTWMBiGiixeJ+3Rl+WVBS4Ph6/7lL76hO5zyD3zIx0JIh1Ty00BTqEUQ4SeRS+IE9McIJw4goiFobR9tX9+d6AUBw+lfLw6Wj34c+q/qCSRNGUXKLQQUyt+Qj6b5uA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bb16074-2c3f-4ad2-7860-08d88bec736c X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:53.9220 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: f/s1dzSXyLlfKY1fnrIu7MgS6xdoIOplRQAHOoClbznXUxirEMG4nsXPBD6HsjVOlc4evLuJ4HxsNina4qqkrg8IzwJVgqqG32v2ErmA8jM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.14.135; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:54 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Check that cancel doesn't wait for 10s of nbd reconnect timeout. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/264 | 38 ++++++++++++++++++++++++++++++-------- tests/qemu-iotests/264.out | 4 ++-- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index 8c61628921..3c6f29317f 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -26,25 +26,26 @@ from iotests import qemu_img_create, file_path, qemu_nbd_popen disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock') nbd_uri = 'nbd+unix:///?socket=' + nbd_sock -size = 5 * 1024 * 1024 wait_limit = 3.0 wait_step = 0.2 class TestNbdReconnect(iotests.QMPTestCase): - def setUp(self): - qemu_img_create('-f', iotests.imgfmt, disk_a, str(size)) - qemu_img_create('-f', iotests.imgfmt, disk_b, str(size)) + def init_vm(self, disk_size): + qemu_img_create('-f', iotests.imgfmt, disk_a, str(disk_size)) + qemu_img_create('-f', iotests.imgfmt, disk_b, str(disk_size)) self.vm = iotests.VM().add_drive(disk_a) self.vm.launch() - self.vm.hmp_qemu_io('drive0', 'write 0 {}'.format(size)) + self.vm.hmp_qemu_io('drive0', 'write 0 {}'.format(disk_size)) def tearDown(self): self.vm.shutdown() os.remove(disk_a) os.remove(disk_b) - def test(self): + def start_job(self, job): + """Stat job with nbd target and kill the server""" + assert job in ('blockdev-backup', 'blockdev-mirror') with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b): result = self.vm.qmp('blockdev-add', **{'node_name': 'backup0', @@ -54,7 +55,7 @@ class TestNbdReconnect(iotests.QMPTestCase): 'path': nbd_sock}, 'reconnect-delay': 10}}) self.assert_qmp(result, 'return', {}) - result = self.vm.qmp('blockdev-backup', device='drive0', + result = self.vm.qmp(job, device='drive0', sync='full', target='backup0', speed=(1 * 1024 * 1024)) self.assert_qmp(result, 'return', {}) @@ -72,7 +73,8 @@ class TestNbdReconnect(iotests.QMPTestCase): jobs = self.vm.qmp('query-block-jobs')['return'] # Check that job is still in progress - self.assertTrue(jobs and jobs[0]['offset'] < jobs[0]['len']) + self.assertTrue(jobs) + self.assertTrue(jobs[0]['offset'] < jobs[0]['len']) result = self.vm.qmp('block-job-set-speed', device='drive0', speed=0) self.assert_qmp(result, 'return', {}) @@ -80,12 +82,32 @@ class TestNbdReconnect(iotests.QMPTestCase): # Emulate server down time for 1 second time.sleep(1) + def test_backup(self): + size = 5 * 1024 * 1024 + self.init_vm(size) + self.start_job('blockdev-backup') + with qemu_nbd_popen('-k', nbd_sock, '-f', iotests.imgfmt, disk_b): e = self.vm.event_wait('BLOCK_JOB_COMPLETED') self.assertEqual(e['data']['offset'], size) result = self.vm.qmp('blockdev-del', node_name='backup0') self.assert_qmp(result, 'return', {}) + 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') + + result = self.vm.qmp('block-job-cancel', device='drive0') + self.assert_qmp(result, 'return', {}) + + start_t = time.time() + self.vm.event_wait('BLOCK_JOB_CANCELLED') + delta_t = time.time() - start_t + self.assertTrue(delta_t < 2.0) + if __name__ == '__main__': iotests.main(supported_fmts=['qcow2']) diff --git a/tests/qemu-iotests/264.out b/tests/qemu-iotests/264.out index ae1213e6f8..fbc63e62f8 100644 --- a/tests/qemu-iotests/264.out +++ b/tests/qemu-iotests/264.out @@ -1,5 +1,5 @@ -. +.. ---------------------------------------------------------------------- -Ran 1 tests +Ran 2 tests OK From patchwork Wed Nov 18 18:04:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915549 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 104FA14C0 for ; Wed, 18 Nov 2020 18:22:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6D3E5208FE for ; Wed, 18 Nov 2020 18:22:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="DDyhxhLR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D3E5208FE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfS5k-000255-9R for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:22:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpv-0004xD-Q9; Wed, 18 Nov 2020 13:05:44 -0500 Received: from mail-eopbgr130110.outbound.protection.outlook.com ([40.107.13.110]:34980 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpg-0008Qn-7w; Wed, 18 Nov 2020 13:05:41 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=khj07gxJf2oqz6JU8OqdMAnGqwaSbocHy+fhGL81bhmn+edYy9wjlqEz88H8LWgZLWo7xKNJvoyI2q/qdDy9wXg7214QlbRNg1yrDvz1+YFhXSujurcHSKPVX95zzPw1pj0yDLu+rvnnOfp6oYc1SjbphZITP/1eV079GMR8q05k2dmaBYbG5+M3o14OCA0z+bMBEp0Ct1GJJ6HU0RjtyLcEpDpdY8H6Gg9ucAV/fq2QHD3erUIurTCnbt14N/iEahEZdHEDbaKkZMcXnzIZCHLqCY513balWfsYVC3hkGwBEx74qNYS8zsGlMZinM0DiSaWR57wEjF5Zu2lvyI6gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SHE9bzaBfBzcr9lo7hxZU+5+d8G+ER3zknAfD6yNi7g=; b=Tr0wY0ik//HpfA4Hc0pt2Oqkye1S62gS5K5e0xewjHvb+p9wgZ6d7q4tEW6BH2uaNIfZjfJZD+dk0evESOALg/EHP6XaQe6Z9L11qjcTYrOfiinE9+3PZXU6JgxA11ZCbJMOWY/cLZbLg6lFTnxWRi7Hc+I2O4FkjQRGqAHcWOS+xBl7E5oygtPIWbaqlOzEQmCtkeuvM+wl3Kh2eMPUyajVQ+AAaSB8QHJz/LJ18R8PVmn4OhZRPPQMuwP18PZR/LaXmL+VV3vy98uo5uRs0/rSipLuFzsTWVtzT5o9rwnsdKxu7SKA92hU9LTLfVgVhu2wKNUgMYqQRp7SFtP6hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SHE9bzaBfBzcr9lo7hxZU+5+d8G+ER3zknAfD6yNi7g=; b=DDyhxhLRTg5Pg0zg7MuXnIvL0uQJUaMM+I5bXjMnoXbtUV0HRrs+GZwNRylHHprh2ogjxpAkx4AoxV7avknh0+5/y6HelS4Z6xNZ3H3YGpmNuFkNDnn8l6BTauEM6Y0rpLSN+8ENIuh1jpWQ2uSAiuUZm7m98A9SRYAkagHhlsI= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:54 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:54 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 10/11] block/backup: implement .cancel job handler Date: Wed, 18 Nov 2020 21:04:32 +0300 Message-Id: <20201118180433.11931-11-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ae24eb1-1701-4481-088c-08d88bec73f0 X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:93; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pDwytjmYXpJhuP/wLpeVrOo1qgJHOy8B7ir22IwHPWpGETth3G3suJ7ppvkxHDWCjOdHMDCAzf0DInsWzchxW3YsXa10pfChMGulyfnhwRdg8uQRTojiQrl6xrXlIWehxhtFeDVzf/uSRx4mG/r2np6qUtmas2FogsRpBkqWvSmExZMQlCtHPaAJxQf2mKOKHa2nF8kUd651y/9xd6p6Yelw3YKvlBdc0oTxDyliWNpkr9/qh7yP32tR6Hc+wDb3+ogY+7aXmic/6MUAct+a9gtCZtjt1UZIysAGhboKKEyAsWO+ZqM9usaNt7xZHuhMFahIlnZuPSeFvrGrkl5fwISexOKLwyd3+Cy2wDQ6B2xyxo5EV0cTfUod358oFTFN X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003)(142923001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: eMvpxpnlTWJvN9w58ovmB/rwHoRe60rA6Kq7LouNroSkKWcBxC1R6ePbufGHnhU7WSLl6DPFli6b9wcd/3Qr/Gl58cALxcv7askMkF2X1WD+3cn6Ir38hmYlnyQaQRrolrghRObCgeFwFuWZhKuxLGQGRMUmu/RKyjkJcRxHXh75JSzkZqH+ZKprLZiBqM46LovCQgII+7jaaWC2o+s8FJHmM6HbAT9zHQLAoilPHNf1+xxo0BBnl1lHzt4GeyLS0f+LZkH7xULxt/654AW7CBXgOp57KR4ldUwi/9Nw6WQa3bDmONuNzoALtIhQPdwVDI1lnY0+R34S6Gy7qCx8pH9tXibBtKMsE8mPuiYDvtXfIDWkHBZijVWMvH+MsNRJFvPvObsVhkOp85BfCaOLIB8iFu5jgWlQHc6+z4Yqivy3cJ7ZTRO+dw/SdEDc+Wh79hqJTabpicxRFDIaz/muMzmnxeEaPSMmbRxn8ucqegElUN/PJc+UnRBDOADkDtUsK6yv2GXqsEZFFrd1uf9amXowJxrYe98Cw/z1xEriRCqmhIkjbnkZ8mH17xEA9lL5LnYxRg0ZMyExWmjzTQi+Lley8vETPSTTCnszbQEjcLGuQgSNAt66tzwwtj6UPuSiZx4cLUOhx1++WpQDnyyNvA== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ae24eb1-1701-4481-088c-08d88bec73f0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:54.7823 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TS1BwZegJHHeEUtE5Umow4Vag7E1UJN1cePiJIWxAUEN+Vtgh1TJW01ehsWMFeTirR0xT5TF1CKNah4Qv9ZxLuXbs8BRl2qxtmC+Rh2xINg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.13.110; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-HE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:46 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Cancel in-flight io on target to not waste the time. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/backup.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/backup.c b/block/backup.c index 9afa0bf3b4..9878594c83 100644 --- a/block/backup.c +++ b/block/backup.c @@ -36,6 +36,7 @@ typedef struct BackupBlockJob { BlockJob common; BlockDriverState *backup_top; BlockDriverState *source_bs; + BlockDriverState *target_bs; BdrvDirtyBitmap *sync_bitmap; @@ -279,6 +280,13 @@ static int coroutine_fn backup_run(Job *job, Error **errp) return ret; } +static void backup_cancel(Job *job) +{ + BackupBlockJob *s = container_of(job, BackupBlockJob, common.job); + + bdrv_cancel_in_flight(s->target_bs); +} + static const BlockJobDriver backup_job_driver = { .job_driver = { .instance_size = sizeof(BackupBlockJob), @@ -289,6 +297,7 @@ static const BlockJobDriver backup_job_driver = { .commit = backup_commit, .abort = backup_abort, .clean = backup_clean, + .cancel = backup_cancel, } }; @@ -456,6 +465,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, job->backup_top = backup_top; job->source_bs = bs; + job->target_bs = target; job->on_source_error = on_source_error; job->on_target_error = on_target_error; job->sync_mode = sync_mode; From patchwork Wed Nov 18 18:04:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 11915559 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3E378A6A for ; Wed, 18 Nov 2020 18:28:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C276B246B9 for ; Wed, 18 Nov 2020 18:28:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="jJQjqGGt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C276B246B9 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=virtuozzo.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:46552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfSC7-0006Gh-EH for patchwork-qemu-devel@patchwork.kernel.org; Wed, 18 Nov 2020 13:28:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRq0-0004y4-4Y; Wed, 18 Nov 2020 13:05:50 -0500 Received: from mail-eopbgr140135.outbound.protection.outlook.com ([40.107.14.135]:60229 helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfRpk-0008Rp-Fl; Wed, 18 Nov 2020 13:05:47 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WklvXb1+7SGD1VR9gjfAlS242CS4MbsGjR8sE6ieVjr1g8XYJ3hSalQb/0mv8csp7epT4AhTRexISjj4KQc0Y0ivZKM+6ExOl0lWml2x43KA4T5ApVlnXwaSdKU3mm9PDy7PqQYRaj8EXUnABLuMiI9u0p6Aubg1i7ZZPpvzutRyu4CxDBSdiRI59Fb/rFFWBiovuUeZRuwICYoeRxYSqm2o57KT4D/9ek/hyPYcLvNACojpRZz2zFhOBfjfo34UGR+xvpIcHVBVotTEPYrtNTLT5E5SfL1sD/aiE2mp9JJapZ8W/qy57gZLoSDhwVnpbgP8TH/CBOuqXkntdP3IhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QvpwijDJ+C74fBJrfaoHNmc1gwAo6woO4gl2y59QxV4=; b=dbA3VlY+ocIhwyUZb16h93pEqHKIBgAGhEMP6artRsU1pdjgOEpEXcbKK6V1rqnJn8f0P4O+p5mdVPjaKERuBTJHGFTCvMSOU53lxWHguaCR7lPGIXWRmNOKl8Ql4fAEFUbvI1j8I52nf4gadDOHAqKAdQDxFNGjRIetoTlEE2cEhXSFryB0Nu8JSTBEm4F6JR2A7d3hsUFYjqHetT3mpcfmP6TUXlyNDHJ8msIov+DZzeOLOWqCyasZIyaEiwbyFV/yNB7GokOgkwIcmezD00COFufgFiJ3rWXyPF92d0KhygMhiyDXghAAaolFBH4+X625p8lF7csxUf/PKfCCHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QvpwijDJ+C74fBJrfaoHNmc1gwAo6woO4gl2y59QxV4=; b=jJQjqGGtoHQyqnfNM3lKEB3rZqq3TZl9WOo/TEU4iU8uPmIEiwemOOwddCMEn5LdDKO7kAesIHA7hlh3qLyReO1k7cWFSxdTtXuuEEa32B7Sz2fKVMlmHaghGNAhQAAmkALSNRvLvTIOB2U/VMYeKjtH8FL+N3PqXkfIVnvk9mE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB5912.eurprd08.prod.outlook.com (2603:10a6:20b:29f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Wed, 18 Nov 2020 18:04:55 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::fd02:1330:f620:1243%9]) with mapi id 15.20.3589.021; Wed, 18 Nov 2020 18:04:55 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, eblake@redhat.com, fam@euphon.net, stefanha@redhat.com, mreitz@redhat.com, kwolf@redhat.com, jsnow@redhat.com, vsementsov@virtuozzo.com, den@openvz.org Subject: [PATCH 11/11] iotests/264: add backup-cancel test-case Date: Wed, 18 Nov 2020 21:04:33 +0300 Message-Id: <20201118180433.11931-12-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20201118180433.11931-1-vsementsov@virtuozzo.com> References: <20201118180433.11931-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.112] X-ClientProxiedBy: AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from kvm.sw.ru (185.215.60.112) by AM0PR04CA0123.eurprd04.prod.outlook.com (2603:10a6:208:55::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.20 via Frontend Transport; Wed, 18 Nov 2020 18:04:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5aa79104-bcef-4045-bc25-08d88bec746e X-MS-TrafficTypeDiagnostic: AS8PR08MB5912: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Jet8uA+u9tC+DbWyfo5+76zveHRixLZ0lO7kn7VXJbFc4Ne5cKKYuwI0RfNgnIj2Y6MPJtrHFHqcE7A0pS3B7fcIe0gROnDpo/aZOxPCO1dt8+y/ERC7AI5m7zJPSm6H3F1aoBysAdDrIAeX+T2Uvu1yafBaPosqkrnkTwGmtMKVnCEAqMVyY/6C2R7xNeCUc5cUCxyv0qF8WjabYmEhXltIikMiRIq46PDrjG3JwmlQPcZPsY/U8+8yiczYG95IfDIKnog/sjmWP3zhAm8QHe+bwMHr1RrSX6WW8uY730lOk0w7v3WmQwGaLZNVyQcVEgwYLtLdPbCnyBSJys+oKA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(136003)(366004)(376002)(396003)(39840400004)(1076003)(6512007)(26005)(36756003)(478600001)(6506007)(6486002)(83380400001)(16526019)(2906002)(186003)(66556008)(66476007)(66946007)(5660300002)(86362001)(316002)(2616005)(8676002)(956004)(6666004)(4326008)(52116002)(6916009)(8936002)(107886003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: XYdofmd850KzJjbcLDkkOcCRCkOITuQnI8+WyUW/I8Gv9PMrvdXsOZ33WjqfZKNbnfFy5g6ZKKVWQCOkOnG1f6GFZvVXDGvEasL2R3Hc/VSK+b30lE/SgZUDNSuIcEpCBqhTLgxAh5A92oxoBVP8GBRZrUyprq4KHwfTmPWyWzvMHJrp+JyMX6wuqY02vsrWNXQzqOnDT0NZKX/lNZ0076SZLQjzMO+nVa6408ugNIygOqInvKnLBd3w6vqN6d+2LGT3yGKi+CS6smMcIkWtoroR9lh5YJcxP6RrB6iutHM2wvJOsgAgy2F4fG8fI7atLO9QRuYCJ/b164BLk17FnkUmFxdyCC5x0uk2N/n3/PraZYHGvtlZ+ez5+CL2m5E739vdBGPjMf/jmw8TzLap5/n4Ha3S6p43A68F51n3536EpCS+Whh+GiGhdXH0adesaWVOVV3VzDoA7DyEQm2utZEe1I9Q6X44iMIJ568uzqf4rKLqbKEU40bDQKLHXik9RA5LZ6tVNQ4Gc0SLfd013JCeohy0oifLii0XQFyJin7aW6GgwMUlcsXMlEQXQn3sngsVi29/cRS1rOo9Oqf3SqnTyubGx3cLYMVh0uz1v6k6eQuXrwLWqMyVodUNxikTilDsvQnUhNQYX+qe85UFVw== X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5aa79104-bcef-4045-bc25-08d88bec746e X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2020 18:04:55.6186 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4hLhanpDHM/nioXAZ8DT7wdPa/7/hyTynlGHQd7QVZ/G6IJpfz2fuYXtr3HLUu57y8oAMJUHWZ+hl6Cepy7av65ah56ts1g10NcdiHNtCJg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB5912 Received-SPF: pass client-ip=40.107.14.135; envelope-from=vsementsov@virtuozzo.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/18 13:04:54 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Check that cancel doesn't wait for 10s of nbd reconnect timeout. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- tests/qemu-iotests/264 | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index 3c6f29317f..b830078834 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -93,13 +93,7 @@ class TestNbdReconnect(iotests.QMPTestCase): result = self.vm.qmp('blockdev-del', node_name='backup0') self.assert_qmp(result, 'return', {}) - 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') - + def cancel_job(self): result = self.vm.qmp('block-job-cancel', device='drive0') self.assert_qmp(result, 'return', {}) @@ -108,6 +102,19 @@ class TestNbdReconnect(iotests.QMPTestCase): delta_t = 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() + + def test_backup_cancel(self): + self.init_vm(5 * 1024 * 1024) + self.start_job('blockdev-backup') + self.cancel_job() + if __name__ == '__main__': iotests.main(supported_fmts=['qcow2'])