From nobody Fri May 3 17:31:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552987603684424.38154090164244; Tue, 19 Mar 2019 02:26:43 -0700 (PDT) Received: from localhost ([127.0.0.1]:53982 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6B18-0004VC-Lh for importer@patchew.org; Tue, 19 Mar 2019 05:26:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6AzH-0003cI-Ta for qemu-devel@nongnu.org; Tue, 19 Mar 2019 05:24:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6AzH-0003TJ-71 for qemu-devel@nongnu.org; Tue, 19 Mar 2019 05:24:47 -0400 Received: from relay.sw.ru ([185.231.240.75]:46934) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6AzG-0003Qf-Os; Tue, 19 Mar 2019 05:24:47 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from ) id 1h6AzD-0002ei-2J; Tue, 19 Mar 2019 12:24:43 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 19 Mar 2019 12:24:42 +0300 Message-Id: <20190319092442.14335-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.18.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH] blockjob: fix user pause in block_job_error_action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jsnow@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Job (especially mirror) may call block_job_error_action several times before actual pause if it has several in-flight requests. block_job_error_action will call job_pause more than once in this case, which lead to following block-job-resume qmp command can't actually resume the job. Fix it by do not increase pause level in block_job_error_action if user_paused already set. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow --- Hi all! I have a reproducer, however, I don't know how to make a test from it, as I don't know a way to create a size-limited directory without root access. So here is it: #!/usr/bin/bash set -e MNT=3D/mirror-test A=3D$MNT/a B=3D$MNT/b STONE=3D$MNT/stone mkdir $MNT mount -t tmpfs -o size=3D11M tmpfs $MNT dd if=3D/dev/urandom of=3D$A bs=3D1M count=3D5 dd if=3D/dev/urandom of=3D$STONE bs=3D1M count=3D5 ( cat <job); - /* make the pause user visible, which will be resumed from QMP. */ - job->job.user_paused =3D true; + if (!job->job.user_paused) { + job_pause(&job->job); + /* make the pause user visible, which will be resumed from QMP= . */ + job->job.user_paused =3D true; + } block_job_iostatus_set_err(job, error); } return action; --=20 2.18.0