qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, famz@redhat.com, pbonzini@redhat.com,
	qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH v2 15/19] test-bdrv-drain: Recursive draining with multiple parents
Date: Thu, 21 Dec 2017 15:22:47 +0100	[thread overview]
Message-ID: <20171221142251.18366-16-kwolf@redhat.com> (raw)
In-Reply-To: <20171221142251.18366-1-kwolf@redhat.com>

Test that drain sections are correctly propagated through the graph.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/test-bdrv-drain.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c
index 16ff3483e3..9e66b40465 100644
--- a/tests/test-bdrv-drain.c
+++ b/tests/test-bdrv-drain.c
@@ -338,6 +338,79 @@ static void test_nested(void)
     blk_unref(blk);
 }
 
+static void test_multiparent(void)
+{
+    BlockBackend *blk_a, *blk_b;
+    BlockDriverState *bs_a, *bs_b, *backing;
+    BDRVTestState *a_s, *b_s, *backing_s;
+
+    blk_a = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+    bs_a = bdrv_new_open_driver(&bdrv_test, "test-node-a", BDRV_O_RDWR,
+                                &error_abort);
+    a_s = bs_a->opaque;
+    blk_insert_bs(blk_a, bs_a, &error_abort);
+
+    blk_b = blk_new(BLK_PERM_ALL, BLK_PERM_ALL);
+    bs_b = bdrv_new_open_driver(&bdrv_test, "test-node-b", BDRV_O_RDWR,
+                                &error_abort);
+    b_s = bs_b->opaque;
+    blk_insert_bs(blk_b, bs_b, &error_abort);
+
+    backing = bdrv_new_open_driver(&bdrv_test, "backing", 0, &error_abort);
+    backing_s = backing->opaque;
+    bdrv_set_backing_hd(bs_a, backing, &error_abort);
+    bdrv_set_backing_hd(bs_b, backing, &error_abort);
+
+    g_assert_cmpint(bs_a->quiesce_counter, ==, 0);
+    g_assert_cmpint(bs_b->quiesce_counter, ==, 0);
+    g_assert_cmpint(backing->quiesce_counter, ==, 0);
+    g_assert_cmpint(a_s->drain_count, ==, 0);
+    g_assert_cmpint(b_s->drain_count, ==, 0);
+    g_assert_cmpint(backing_s->drain_count, ==, 0);
+
+    do_drain_begin(BDRV_SUBTREE_DRAIN, bs_a);
+
+    g_assert_cmpint(bs_a->quiesce_counter, ==, 1);
+    g_assert_cmpint(bs_b->quiesce_counter, ==, 1);
+    g_assert_cmpint(backing->quiesce_counter, ==, 1);
+    g_assert_cmpint(a_s->drain_count, ==, 1);
+    g_assert_cmpint(b_s->drain_count, ==, 1);
+    g_assert_cmpint(backing_s->drain_count, ==, 1);
+
+    do_drain_begin(BDRV_SUBTREE_DRAIN, bs_b);
+
+    g_assert_cmpint(bs_a->quiesce_counter, ==, 2);
+    g_assert_cmpint(bs_b->quiesce_counter, ==, 2);
+    g_assert_cmpint(backing->quiesce_counter, ==, 2);
+    g_assert_cmpint(a_s->drain_count, ==, 2);
+    g_assert_cmpint(b_s->drain_count, ==, 2);
+    g_assert_cmpint(backing_s->drain_count, ==, 2);
+
+    do_drain_end(BDRV_SUBTREE_DRAIN, bs_b);
+
+    g_assert_cmpint(bs_a->quiesce_counter, ==, 1);
+    g_assert_cmpint(bs_b->quiesce_counter, ==, 1);
+    g_assert_cmpint(backing->quiesce_counter, ==, 1);
+    g_assert_cmpint(a_s->drain_count, ==, 1);
+    g_assert_cmpint(b_s->drain_count, ==, 1);
+    g_assert_cmpint(backing_s->drain_count, ==, 1);
+
+    do_drain_end(BDRV_SUBTREE_DRAIN, bs_a);
+
+    g_assert_cmpint(bs_a->quiesce_counter, ==, 0);
+    g_assert_cmpint(bs_b->quiesce_counter, ==, 0);
+    g_assert_cmpint(backing->quiesce_counter, ==, 0);
+    g_assert_cmpint(a_s->drain_count, ==, 0);
+    g_assert_cmpint(b_s->drain_count, ==, 0);
+    g_assert_cmpint(backing_s->drain_count, ==, 0);
+
+    bdrv_unref(backing);
+    bdrv_unref(bs_a);
+    bdrv_unref(bs_b);
+    blk_unref(blk_a);
+    blk_unref(blk_b);
+}
+
 
 typedef struct TestBlockJob {
     BlockJob common;
@@ -487,6 +560,7 @@ int main(int argc, char **argv)
                     test_quiesce_co_drain_subtree);
 
     g_test_add_func("/bdrv-drain/nested", test_nested);
+    g_test_add_func("/bdrv-drain/multiparent", test_multiparent);
 
     g_test_add_func("/bdrv-drain/blockjob/drain_all", test_blockjob_drain_all);
     g_test_add_func("/bdrv-drain/blockjob/drain", test_blockjob_drain);
-- 
2.13.6

  parent reply	other threads:[~2017-12-21 14:24 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-21 14:22 [Qemu-devel] [PATCH v2 00/19] Drain fixes and cleanups, part 2 Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 01/19] block: Remove unused bdrv_requests_pending Kevin Wolf
2018-01-03 16:09   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 02/19] block: Assert drain_all is only called from main AioContext Kevin Wolf
2018-01-08 16:09   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 03/19] block: Make bdrv_drain() driver callbacks non-recursive Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 04/19] test-bdrv-drain: Test callback for bdrv_drain Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 05/19] test-bdrv-drain: Test bs->quiesce_counter Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 06/19] blockjob: Pause job on draining any job BDS Kevin Wolf
2018-01-08 14:44   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 07/19] test-bdrv-drain: Test drain vs. block jobs Kevin Wolf
2018-01-08 15:21   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 08/19] block: Don't block_job_pause_all() in bdrv_drain_all() Kevin Wolf
2018-01-08 15:15   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 09/19] block: Nested drain_end must still call callbacks Kevin Wolf
2018-01-08 15:41   ` [Qemu-devel] [Qemu-block] " Alberto Garcia
2018-01-08 18:00     ` Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 10/19] test-bdrv-drain: Test nested drain sections Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 11/19] block: Don't notify parents in drain call chain Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 12/19] block: Add bdrv_subtree_drained_begin/end() Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 13/19] test-bdrv-drain: Tests for bdrv_subtree_drain Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 14/19] test-bdrv-drain: Test behaviour in coroutine context Kevin Wolf
2017-12-21 14:22 ` Kevin Wolf [this message]
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 16/19] block: Allow graph changes in subtree drained section Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 17/19] test-bdrv-drain: Test graph changes in " Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 18/19] commit: Simplify reopen of base Kevin Wolf
2017-12-21 14:22 ` [Qemu-devel] [PATCH v2 19/19] block: Keep nodes drained between reopen_queue/multiple Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171221142251.18366-16-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=famz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).