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, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 26/27] iotests: Check that images are in read-only mode after block-commit
Date: Tue, 30 Apr 2019 17:42:43 +0200	[thread overview]
Message-ID: <20190430154244.30083-27-kwolf@redhat.com> (raw)
In-Reply-To: <20190430154244.30083-1-kwolf@redhat.com>

From: Alberto Garcia <berto@igalia.com>

This tests the fix from the previous patch.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/249     | 115 +++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/249.out |  35 +++++++++++
 tests/qemu-iotests/group   |   1 +
 3 files changed, 151 insertions(+)
 create mode 100755 tests/qemu-iotests/249
 create mode 100644 tests/qemu-iotests/249.out

diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
new file mode 100755
index 0000000000..e4650ecf6b
--- /dev/null
+++ b/tests/qemu-iotests/249
@@ -0,0 +1,115 @@
+#!/usr/bin/env bash
+#
+# Test that a backing image is put back in read-only mode after
+# block-commit (both when it fails and when it succeeds).
+#
+# Copyright (C) 2019 Igalia, S.L.
+#
+# 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=berto@igalia.com
+
+seq="$(basename $0)"
+echo "QA output created by $seq"
+
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img
+    rm -f "$TEST_IMG.base"
+    rm -f "$TEST_IMG.int"
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+. ./common.qemu
+
+# Any format implementing BlockDriver.bdrv_change_backing_file
+_supported_fmt qcow2 qed
+_supported_proto file
+_supported_os Linux
+
+IMG_SIZE=1M
+
+# Create the images: base <- int <- active
+TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE | _filter_imgfmt
+TEST_IMG="$TEST_IMG.int" _make_test_img -b "$TEST_IMG.base" | _filter_imgfmt
+_make_test_img -b "$TEST_IMG.int" | _filter_imgfmt
+
+# Launch QEMU with these two drives:
+# none0: base (read-only)
+# none1: base <- int <- active
+_launch_qemu -drive if=none,file="${TEST_IMG}.base",node-name=base,read-only=on \
+             -drive if=none,file="${TEST_IMG}",backing.node-name=int,backing.backing=base
+
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'qmp_capabilities' }" \
+    'return'
+
+echo
+echo '=== Send a write command to a drive opened in read-only mode (1)'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'human-monitor-command',
+       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
+    'return'
+
+echo
+echo '=== Run block-commit on base using an invalid filter node name'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'block-commit',
+       'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int',
+                     'filter-node-name': '1234'}}" \
+    'error'
+
+echo
+echo '=== Send a write command to a drive opened in read-only mode (2)'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'human-monitor-command',
+       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
+    'return'
+
+echo
+echo '=== Run block-commit on base using the default filter node name'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'block-commit',
+       'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int'}}" \
+    'return'
+
+# Wait for block-commit to finish
+_send_qemu_cmd $QEMU_HANDLE '' \
+    '"status": "null"'
+
+echo
+echo '=== Send a write command to a drive opened in read-only mode (3)'
+echo
+_send_qemu_cmd $QEMU_HANDLE \
+    "{ 'execute': 'human-monitor-command',
+       'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
+    'return'
+
+_cleanup_qemu
+
+# success, all done
+echo "*** done"
+rm -f $seq.full
+status=0
diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out
new file mode 100644
index 0000000000..1c93164e84
--- /dev/null
+++ b/tests/qemu-iotests/249.out
@@ -0,0 +1,35 @@
+QA output created by 249
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1048576
+Formatting 'TEST_DIR/t.IMGFMT.int', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.base
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.int
+{"return": {}}
+
+=== Send a write command to a drive opened in read-only mode (1)
+
+{"return": "Block node is read-onlyrn"}
+
+=== Run block-commit on base using an invalid filter node name
+
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
+{"error": {"class": "GenericError", "desc": "Invalid node name"}}
+
+=== Send a write command to a drive opened in read-only mode (2)
+
+{"return": "Block node is read-onlyrn"}
+
+=== Run block-commit on base using the default filter node name
+
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
+{"return": {}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0, "type": "commit"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
+
+=== Send a write command to a drive opened in read-only mode (3)
+
+{"return": "Block node is read-onlyrn"}
+*** done
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index bae7718380..7ac9a5ea4a 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -248,3 +248,4 @@
 246 rw auto quick
 247 rw auto quick
 248 rw auto quick
+249 rw auto quick
-- 
2.20.1

  parent reply	other threads:[~2019-04-30 15:43 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-30 15:42 [Qemu-devel] [PULL 00/27] Block layer patches Kevin Wolf
2019-04-30 15:42 ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 01/27] tests/qemu-iotests: Fix output of qemu-io related tests Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 02/27] block: Fix AioContext switch for bs->drv == NULL Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 03/27] vpc: unlock Coroutine lock to make IO submit Concurrently Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 04/27] vmdk: Set vmdk parent backing_format to vmdk Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 05/27] block/vhdx: Remove redundant IEC binary prefixes definition Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 06/27] block/vhdx: Use IEC binary prefixes for size constants Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 07/27] cutils: Fix size_to_str() on 32-bit platforms Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 08/27] qemu-img: Saner printing of large file sizes Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 09/27] qcow2: Avoid COW during metadata preallocation Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 10/27] qcow2: Add errp to preallocate_co() Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 11/27] qcow2: Fix full preallocation with external data file Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 12/27] iotests: Perform the correct test in 082 Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 13/27] qemu-img: Make create hint at protocol options Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 14/27] qcow2: Fix qcow2_make_empty() with external data file Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 15/27] qcow2: Fix error handling in the compression code Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 16/27] block: introduce byte-based io helpers Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 17/27] block/qcow2: use buffer-based io Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 18/27] block/qcow: " Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 19/27] block/qed: " Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 20/27] block/parallels: " Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 21/27] block/backup: " Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 22/27] block/commit: " Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 23/27] block/stream: " Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 24/27] qemu-img: " Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 25/27] commit: Make base read-only if there is an early failure Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 15:42 ` Kevin Wolf [this message]
2019-04-30 15:42   ` [Qemu-devel] [PULL 26/27] iotests: Check that images are in read-only mode after block-commit Kevin Wolf
2019-04-30 15:42 ` [Qemu-devel] [PULL 27/27] block/qed: add missed coroutine_fn markers Kevin Wolf
2019-04-30 15:42   ` Kevin Wolf
2019-04-30 16:57 ` [Qemu-devel] [PULL 00/27] Block layer patches Peter Maydell
2019-04-30 16:57   ` 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=20190430154244.30083-27-kwolf@redhat.com \
    --to=kwolf@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).