All of lore.kernel.org
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL v2 31/50] iotests: Add test for block jobs and BDS ejection
Date: Tue,  2 Feb 2016 18:35:24 +0100	[thread overview]
Message-ID: <1454434543-25963-32-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1454434543-25963-1-git-send-email-mreitz@redhat.com>

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/141     | 186 +++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/141.out |  59 ++++++++++++++
 tests/qemu-iotests/group   |   1 +
 3 files changed, 246 insertions(+)
 create mode 100755 tests/qemu-iotests/141
 create mode 100644 tests/qemu-iotests/141.out

diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
new file mode 100755
index 0000000..f7c28b4
--- /dev/null
+++ b/tests/qemu-iotests/141
@@ -0,0 +1,186 @@
+#!/bin/bash
+#
+# Test case for ejecting BDSs with block jobs still running on them
+#
+# Copyright (C) 2016 Red Hat, Inc.
+#
+# 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/>.
+#
+
+# creator
+owner=mreitz@redhat.com
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+
+here="$PWD"
+tmp=/tmp/$$
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img
+    rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+. ./common.qemu
+
+# Needs backing file and backing format support
+_supported_fmt qcow2 qed
+_supported_proto file
+_supported_os Linux
+
+
+test_blockjob()
+{
+    _send_qemu_cmd $QEMU_HANDLE \
+        "{'execute': 'blockdev-add',
+          'arguments': {
+              'options': {
+                  'id': 'drv0',
+                  'driver': '$IMGFMT',
+                  'file': {
+                      'driver': 'file',
+                      'filename': '$TEST_IMG'
+                  }}}}" \
+        'return'
+
+    _send_qemu_cmd $QEMU_HANDLE \
+        "$1" \
+        "$2" \
+        | _filter_img_create
+
+    # We want this to return an error because the block job is still running
+    _send_qemu_cmd $QEMU_HANDLE \
+        "{'execute': 'x-blockdev-remove-medium',
+          'arguments': {'device': 'drv0'}}" \
+        'error'
+
+    _send_qemu_cmd $QEMU_HANDLE \
+        "{'execute': 'block-job-cancel',
+          'arguments': {'device': 'drv0'}}" \
+        "$3"
+
+    _send_qemu_cmd $QEMU_HANDLE \
+        "{'execute': 'x-blockdev-del',
+          'arguments': {'id': 'drv0'}}" \
+        'return'
+}
+
+
+TEST_IMG="$TEST_DIR/b.$IMGFMT" _make_test_img 1M
+TEST_IMG="$TEST_DIR/m.$IMGFMT" _make_test_img -b "$TEST_DIR/b.$IMGFMT" 1M
+_make_test_img -b "$TEST_DIR/m.$IMGFMT" 1M
+
+_launch_qemu -nodefaults
+
+_send_qemu_cmd $QEMU_HANDLE \
+    "{'execute': 'qmp_capabilities'}" \
+    'return'
+
+echo
+echo '=== Testing drive-backup ==='
+echo
+
+# drive-backup will not send BLOCK_JOB_READY by itself, and cancelling the job
+# will consequently result in BLOCK_JOB_CANCELLED being emitted.
+
+test_blockjob \
+    "{'execute': 'drive-backup',
+      'arguments': {'device': 'drv0',
+                    'target': '$TEST_DIR/o.$IMGFMT',
+                    'format': '$IMGFMT',
+                    'sync': 'none'}}" \
+    'return' \
+    'BLOCK_JOB_CANCELLED'
+
+echo
+echo '=== Testing drive-mirror ==='
+echo
+
+# drive-mirror will send BLOCK_JOB_READY basically immediately, and cancelling
+# the job will consequently result in BLOCK_JOB_COMPLETED being emitted.
+
+test_blockjob \
+    "{'execute': 'drive-mirror',
+      'arguments': {'device': 'drv0',
+                    'target': '$TEST_DIR/o.$IMGFMT',
+                    'format': '$IMGFMT',
+                    'sync': 'none'}}" \
+    'BLOCK_JOB_READY' \
+    'BLOCK_JOB_COMPLETED'
+
+echo
+echo '=== Testing active block-commit ==='
+echo
+
+# An active block-commit will send BLOCK_JOB_READY basically immediately, and
+# cancelling the job will consequently result in BLOCK_JOB_COMPLETED being
+# emitted.
+
+test_blockjob \
+    "{'execute': 'block-commit',
+      'arguments': {'device': 'drv0'}}" \
+    'BLOCK_JOB_READY' \
+    'BLOCK_JOB_COMPLETED'
+
+echo
+echo '=== Testing non-active block-commit ==='
+echo
+
+# Give block-commit something to work on, otherwise it would be done
+# immediately, send a BLOCK_JOB_COMPLETED and ejecting the BDS would work just
+# fine without the block job still running.
+
+$QEMU_IO -c 'write 0 1M' "$TEST_DIR/m.$IMGFMT" | _filter_qemu_io
+
+test_blockjob \
+    "{'execute': 'block-commit',
+      'arguments': {'device': 'drv0',
+                    'top':    '$TEST_DIR/m.$IMGFMT',
+                    'speed':  1}}" \
+    'return' \
+    'BLOCK_JOB_CANCELLED'
+
+echo
+echo '=== Testing block-stream ==='
+echo
+
+# Give block-stream something to work on, otherwise it would be done
+# immediately, send a BLOCK_JOB_COMPLETED and ejecting the BDS would work just
+# fine without the block job still running.
+
+$QEMU_IO -c 'write 0 1M' "$TEST_DIR/b.$IMGFMT" | _filter_qemu_io
+
+# With some data to stream (and @speed set to 1), block-stream will not complete
+# until we send the block-job-cancel command. Therefore, no event other than
+# BLOCK_JOB_CANCELLED will be emitted.
+
+test_blockjob \
+    "{'execute': 'block-stream',
+      'arguments': {'device': 'drv0',
+                    'speed': 1}}" \
+    'return' \
+    'BLOCK_JOB_CANCELLED'
+
+_cleanup_qemu
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/141.out b/tests/qemu-iotests/141.out
new file mode 100644
index 0000000..adceac1
--- /dev/null
+++ b/tests/qemu-iotests/141.out
@@ -0,0 +1,59 @@
+QA output created by 141
+Formatting 'TEST_DIR/b.IMGFMT', fmt=IMGFMT size=1048576
+Formatting 'TEST_DIR/m.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/b.IMGFMT
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/m.IMGFMT
+{"return": {}}
+
+=== Testing drive-backup ===
+
+{"return": {}}
+Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
+{"return": {}}
+{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: backup"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "drv0", "len": 1048576, "offset": 0, "speed": 0, "type": "backup"}}
+{"return": {}}
+
+=== Testing drive-mirror ===
+
+{"return": {}}
+Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}
+{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: mirror"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}
+{"return": {}}
+
+=== Testing active block-commit ===
+
+{"return": {}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
+{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: commit"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
+{"return": {}}
+
+=== Testing non-active block-commit ===
+
+wrote 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+{"return": {}}
+{"return": {}}
+{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: commit"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "drv0", "len": 1048576, "offset": 524288, "speed": 1, "type": "commit"}}
+{"return": {}}
+
+=== Testing block-stream ===
+
+wrote 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+{"return": {}}
+{"return": {}}
+{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: stream"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "drv0", "len": 1048576, "offset": 524288, "speed": 1, "type": "stream"}}
+{"return": {}}
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index e89f076..cbc970a 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -143,5 +143,6 @@
 138 rw auto quick
 139 rw auto quick
 140 rw auto quick
+141 rw auto quick
 142 auto
 143 auto quick
-- 
2.7.0

  parent reply	other threads:[~2016-02-02 17:36 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-02 17:34 [Qemu-devel] [PULL v2 00/50] Block patches Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 01/50] block: Add blk_dev_has_tray() Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 02/50] blockdev: Fix 'change' for slot devices Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 03/50] Revert "hw/block/fdc: Implement tray status" Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 04/50] block/qapi: Emit tray_open only if there is a tray Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 05/50] vmdk: Fix converting to streamOptimized Max Reitz
2016-02-02 17:34 ` [Qemu-devel] [PULL v2 06/50] iotests: Limit supported formats for 118 Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 07/50] nbd: client_close on error in nbd_co_client_start Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 08/50] iotests: Rename filter_nbd to _filter_nbd in 083 Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 09/50] iotests: Change coding style of " Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 10/50] iotests: Move _filter_nbd into common.filter Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 11/50] iotests: Make _filter_nbd drop log lines Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 12/50] iotests: Make _filter_nbd support more URL types Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 13/50] iotests: Make redirecting qemu's stderr optional Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 14/50] iotests: Add test for a nonexistent NBD export Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 15/50] block: Remove unused struct definition BlockFinishData Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 16/50] block: Release named dirty bitmaps in bdrv_close() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 17/50] iotests: Add test for eject under NBD server Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 18/50] block: Add BB-BDS remove/insert notifiers Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 19/50] virtio-blk: Functions for op blocker management Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 20/50] virtio-scsi: Catch BDS-BB removal/insertion Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 21/50] nbd: Switch from close to eject notifier Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 22/50] block: Remove BDS close notifier Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 23/50] block: Use blk_remove_bs() in blk_delete() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 24/50] blockdev: Use blk_remove_bs() in do_drive_del() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 25/50] block: Make bdrv_close() static Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 26/50] block: Add list of all BlockDriverStates Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 27/50] blockdev: Keep track of monitor-owned BDS Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 28/50] block: Add blk_remove_all_bs() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 29/50] block: Rewrite bdrv_close_all() Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 30/50] iotests: Add test for multiple BB on BDS tree Max Reitz
2016-02-02 17:35 ` Max Reitz [this message]
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 32/50] block: acquire in bdrv_query_image_info Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 33/50] block: Add "file" output parameter to block status query functions Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 34/50] qcow: Assign bs->file->bs to file in qcow_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 35/50] qcow2: Assign bs->file->bs to file in qcow2_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 36/50] raw: Assign bs to file in raw_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 37/50] iscsi: Assign bs to file in iscsi_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 38/50] parallels: Assign bs->file->bs to file in parallels_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 39/50] qed: Assign bs->file->bs to file in bdrv_qed_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 40/50] sheepdog: Assign bs to file in sd_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 41/50] vdi: Assign bs->file->bs to file in vdi_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 42/50] vpc: Assign bs->file->bs to file in vpc_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 43/50] vmdk: Fix calculation of block status's offset Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 44/50] vmdk: Return extent's file in bdrv_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 45/50] block: Use returned *file in bdrv_co_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 46/50] qemu-img: In "map", use the returned "file" from bdrv_get_block_status Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 47/50] qemu-img: Make MapEntry a QAPI struct Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 48/50] iotests: Add "qemu-img map" test for VMDK extents Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 49/50] block: set device_list.tqe_prev to NULL on BDS removal Max Reitz
2016-02-02 17:35 ` [Qemu-devel] [PULL v2 50/50] block: qemu-iotests - add test for snapshot, commit, snapshot bug Max Reitz
2016-02-02 20:25 ` [Qemu-devel] [PULL v2 00/50] Block patches Peter Maydell

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=1454434543-25963-32-git-send-email-mreitz@redhat.com \
    --to=mreitz@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.