From nobody Sun May 4 18:45:01 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as
permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted
sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by
mx.zohomail.com
with SMTPS id 1513957511216380.8453813795927;
Fri, 22 Dec 2017 07:45:11 -0800 (PST)
Received: from localhost ([::1]:54773 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1eSPVN-0002jb-Q8
for importer@patchew.org; Fri, 22 Dec 2017 10:45:01 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57489)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP6r-0005yd-4i
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from <kwolf@redhat.com>) id 1eSP6p-0002cq-V2
for qemu-devel@nongnu.org; Fri, 22 Dec 2017 10:19:41 -0500
Received: from mx1.redhat.com ([209.132.183.28]:45652)
by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
(Exim 4.71) (envelope-from <kwolf@redhat.com>)
id 1eSP6m-0002Wy-19; Fri, 22 Dec 2017 10:19:36 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
[10.5.11.12])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 4AC5180476;
Fri, 22 Dec 2017 15:19:33 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-117-107.ams2.redhat.com
[10.36.117.107])
by smtp.corp.redhat.com (Postfix) with ESMTP id 1CB5651DED;
Fri, 22 Dec 2017 15:19:29 +0000 (UTC)
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Date: Fri, 22 Dec 2017 16:18:34 +0100
Message-Id: <20171222151846.28110-24-kwolf@redhat.com>
In-Reply-To: <20171222151846.28110-1-kwolf@redhat.com>
References: <20171222151846.28110-1-kwolf@redhat.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.28]);
Fri, 22 Dec 2017 15:19:33 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
[fuzzy]
X-Received-From: 209.132.183.28
Subject: [Qemu-devel] [PULL v3 23/35] test-bdrv-drain: Test drain vs. block
jobs
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail: RSF_0 Z_629925259 SPT_0
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Block jobs must be paused if any of the involved nodes are drained.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/test-bdrv-drain.c | 121 ++++++++++++++++++++++++++++++++++++++++++++=
++++
1 file changed, 121 insertions(+)
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index 323cb0b961..9783768a20 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -24,6 +24,7 @@
=20
#include "qemu/osdep.h"
#include "block/block.h"
+#include "block/blockjob_int.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
=20
@@ -220,6 +221,123 @@ static void test_quiesce_drain(void)
test_quiesce_common(BDRV_DRAIN, false);
}
=20
+
+typedef struct TestBlockJob {
+ BlockJob common;
+ bool should_complete;
+} TestBlockJob;
+
+static void test_job_completed(BlockJob *job, void *opaque)
+{
+ block_job_completed(job, 0);
+}
+
+static void coroutine_fn test_job_start(void *opaque)
+{
+ TestBlockJob *s =3D opaque;
+
+ while (!s->should_complete) {
+ block_job_sleep_ns(&s->common, 100000);
+ }
+
+ block_job_defer_to_main_loop(&s->common, test_job_completed, NULL);
+}
+
+static void test_job_complete(BlockJob *job, Error **errp)
+{
+ TestBlockJob *s =3D container_of(job, TestBlockJob, common);
+ s->should_complete =3D true;
+}
+
+BlockJobDriver test_job_driver =3D {
+ .instance_size =3D sizeof(TestBlockJob),
+ .start =3D test_job_start,
+ .complete =3D test_job_complete,
+};
+
+static void test_blockjob_common(enum drain_type drain_type)
+{
+ BlockBackend *blk_src, *blk_target;
+ BlockDriverState *src, *target;
+ BlockJob *job;
+ int ret;
+
+ src =3D bdrv_new_open_driver(&bdrv_test, "source", BDRV_O_RDWR,
+ &error_abort);
+ blk_src =3D blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+ blk_insert_bs(blk_src, src, &error_abort);
+
+ target =3D bdrv_new_open_driver(&bdrv_test, "target", BDRV_O_RDWR,
+ &error_abort);
+ blk_target =3D blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+ blk_insert_bs(blk_target, target, &error_abort);
+
+ job =3D block_job_create("job0", &test_job_driver, src, 0, BLK_PERM_AL=
L, 0,
+ 0, NULL, NULL, &error_abort);
+ block_job_add_bdrv(job, "target", target, 0, BLK_PERM_ALL, &error_abor=
t);
+ block_job_start(job);
+
+ g_assert_cmpint(job->pause_count, =3D=3D, 0);
+ g_assert_false(job->paused);
+ g_assert_false(job->busy); /* We're in block_job_sleep_ns() */
+
+ do_drain_begin(drain_type, src);
+
+ if (drain_type =3D=3D BDRV_DRAIN_ALL) {
+ /* bdrv_drain_all() drains both src and target, and involves an
+ * additional block_job_pause_all() */
+ g_assert_cmpint(job->pause_count, =3D=3D, 3);
+ } else {
+ g_assert_cmpint(job->pause_count, =3D=3D, 1);
+ }
+ /* XXX We don't wait until the job is actually paused. Is this okay? */
+ /* g_assert_true(job->paused); */
+ g_assert_false(job->busy); /* The job is paused */
+
+ do_drain_end(drain_type, src);
+
+ g_assert_cmpint(job->pause_count, =3D=3D, 0);
+ g_assert_false(job->paused);
+ g_assert_false(job->busy); /* We're in block_job_sleep_ns() */
+
+ do_drain_begin(drain_type, target);
+
+ if (drain_type =3D=3D BDRV_DRAIN_ALL) {
+ /* bdrv_drain_all() drains both src and target, and involves an
+ * additional block_job_pause_all() */
+ g_assert_cmpint(job->pause_count, =3D=3D, 3);
+ } else {
+ g_assert_cmpint(job->pause_count, =3D=3D, 1);
+ }
+ /* XXX We don't wait until the job is actually paused. Is this okay? */
+ /* g_assert_true(job->paused); */
+ g_assert_false(job->busy); /* The job is paused */
+
+ do_drain_end(drain_type, target);
+
+ g_assert_cmpint(job->pause_count, =3D=3D, 0);
+ g_assert_false(job->paused);
+ g_assert_false(job->busy); /* We're in block_job_sleep_ns() */
+
+ ret =3D block_job_complete_sync(job, &error_abort);
+ g_assert_cmpint(ret, =3D=3D, 0);
+
+ blk_unref(blk_src);
+ blk_unref(blk_target);
+ bdrv_unref(src);
+ bdrv_unref(target);
+}
+
+static void test_blockjob_drain_all(void)
+{
+ test_blockjob_common(BDRV_DRAIN_ALL);
+}
+
+static void test_blockjob_drain(void)
+{
+ test_blockjob_common(BDRV_DRAIN);
+}
+
int main(int argc, char **argv)
{
bdrv_init();
@@ -233,5 +351,8 @@ int main(int argc, char **argv)
g_test_add_func("/bdrv-drain/quiesce/drain_all", test_quiesce_drain_al=
l);
g_test_add_func("/bdrv-drain/quiesce/drain", test_quiesce_drain);
=20
+ g_test_add_func("/bdrv-drain/blockjob/drain_all", test_blockjob_drain_=
all);
+ g_test_add_func("/bdrv-drain/blockjob/drain", test_blockjob_drain);
+
return g_test_run();
}
--=20
2.13.6