From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org, qemu-devel@nongnu.org
Cc: mreitz@redhat.com, kwolf@redhat.com, jcody@redhat.com,
pbonzini@redhat.com, dplotnikov@virtuozzo.com, den@openvz.org,
vsementsov@virtuozzo.com, qemu-stable@nongnu.org
Subject: [Qemu-devel] [PATCH v2 2/2] iotests: simple mirror test with kvm on 1G image
Date: Thu, 29 Nov 2018 13:18:01 +0300 [thread overview]
Message-ID: <20181129101801.6421-3-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20181129101801.6421-1-vsementsov@virtuozzo.com>
This test is broken without previous commit fixing dead-lock in mirror.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/235 | 59 ++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/235.out | 1 +
tests/qemu-iotests/group | 1 +
3 files changed, 61 insertions(+)
create mode 100755 tests/qemu-iotests/235
create mode 100644 tests/qemu-iotests/235.out
diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
new file mode 100755
index 0000000000..e5d1ae6593
--- /dev/null
+++ b/tests/qemu-iotests/235
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+#
+# Simple mirror test
+#
+# Copyright (c) 2018 Virtuozzo International GmbH. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import sys
+import os
+import iotests
+from iotests import qemu_img_create, qemu_io, file_path
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scripts'))
+
+from qemu import QEMUMachine
+
+# Note:
+# This test was added to check that mirror dead-lock was fixed (see previous
+# commit before this test addition).
+# And it didn't reproduce if at least one of the following:
+# 1. use small image size
+# 2. use raw format (not qcow2)
+# 3. drop kvm and use iotests.VM() (maybe, because of qtest) (however, it still
+# reproduces, if just drop kvm, but gdb failed to produce full backtraces
+# for me)
+# 4. add iothread
+
+size = '1G'
+
+iotests.verify_image_format(supported_fmts=['raw', 'qcow2'])
+
+disk, target = file_path('disk', 'target')
+
+# prepare source image
+qemu_img_create('-f', iotests.imgfmt, disk, size)
+qemu_io('-f', iotests.imgfmt, '-c', 'write 0 ' + size, disk)
+
+vm = QEMUMachine(iotests.qemu_prog)
+vm.add_args('-machine', 'pc,accel=kvm')
+vm.add_args('-drive', 'id=src,file=' + disk)
+vm.launch()
+
+print(vm.qmp('drive-mirror', device='src', target=target, sync='full'))
+vm.event_wait('BLOCK_JOB_READY')
+
+vm.shutdown()
diff --git a/tests/qemu-iotests/235.out b/tests/qemu-iotests/235.out
new file mode 100644
index 0000000000..d6ccbad8fa
--- /dev/null
+++ b/tests/qemu-iotests/235.out
@@ -0,0 +1 @@
+{u'return': {}}
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 8c56a0ad11..61a6d98ebd 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -232,3 +232,4 @@
232 auto quick
233 auto quick
234 auto quick migration
+235 auto quick
--
2.18.0
next prev parent reply other threads:[~2018-11-29 10:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-29 10:17 [Qemu-devel] [PATCH v2 0/2] mirror dead-lock Vladimir Sementsov-Ogievskiy
2018-11-29 10:18 ` [Qemu-devel] [PATCH v2 1/2] mirror: fix dead-lock Vladimir Sementsov-Ogievskiy
2018-11-30 12:36 ` Max Reitz
2018-11-29 10:18 ` Vladimir Sementsov-Ogievskiy [this message]
2018-11-30 12:19 ` [Qemu-devel] [PATCH v2 2/2] iotests: simple mirror test with kvm on 1G image Kevin Wolf
2018-11-30 12:30 ` Max Reitz
2018-11-30 13:06 ` Vladimir Sementsov-Ogievskiy
2018-11-30 13:13 ` Max Reitz
2018-11-30 13:48 ` Vladimir Sementsov-Ogievskiy
2018-11-30 14:10 ` Kevin Wolf
2018-11-30 14:51 ` Vladimir Sementsov-Ogievskiy
2018-11-30 14:59 ` Max Reitz
2018-11-30 15:24 ` Vladimir Sementsov-Ogievskiy
2018-11-30 15:33 ` Max Reitz
2018-11-30 16:14 ` Vladimir Sementsov-Ogievskiy
2018-11-30 12:33 ` Max Reitz
2018-11-29 14:14 ` [Qemu-devel] [Qemu-devel for-3.1?] [PATCH v2 0/2] mirror dead-lock Eric Blake
2018-11-30 12:52 ` Max Reitz
2018-12-03 13:59 ` [Qemu-devel] " Max Reitz
2018-12-03 14:13 ` Vladimir Sementsov-Ogievskiy
2018-12-03 14:26 ` Max Reitz
2018-12-03 17:06 ` Eric Blake
2018-12-03 15:07 ` Peter Maydell
2018-12-03 16:06 ` 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=20181129101801.6421-3-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=den@openvz.org \
--cc=dplotnikov@virtuozzo.com \
--cc=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@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).