174 lines
6.1 KiB
Diff
174 lines
6.1 KiB
Diff
|
From 171becce35c675a68b5a9b7d4ecea9de88906346 Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Snow <jsnow@redhat.com>
|
||
|
|
Date: Wed, 10 Oct 2018 20:51:00 +0100
|
||
|
|
Subject: [PATCH 3/3] block: iotest to catch abort on forced blockjob cancel
|
||
|
|
|
||
|
|
RH-Author: John Snow <jsnow@redhat.com>
|
||
|
|
Message-id: <20181010205100.17689-4-jsnow@redhat.com>
|
||
|
|
Patchwork-id: 82632
|
||
|
|
O-Subject: [RHEL8/rhel qemu-kvm PATCH 3/3] block: iotest to catch abort on forced blockjob cancel
|
||
|
|
Bugzilla: 1635583
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
|
||
|
|
From: Jeff Cody <jcody@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
||
|
|
Reviewed-by: John Snow <jsnow@redhat.com>
|
||
|
|
Message-id: df317f617fbe5affcf699cb8560e7b0c2e028a64.1534868459.git.jcody@redhat.com
|
||
|
|
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
||
|
|
(cherry picked from commit 26bf474ba92c76e61bea51726e22da6dfd185296)
|
||
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
tests/qemu-iotests/229 | 95 ++++++++++++++++++++++++++++++++++++++++++++++
|
||
|
|
tests/qemu-iotests/229.out | 23 +++++++++++
|
||
|
|
tests/qemu-iotests/group | 1 +
|
||
|
|
3 files changed, 119 insertions(+)
|
||
|
|
create mode 100755 tests/qemu-iotests/229
|
||
|
|
create mode 100644 tests/qemu-iotests/229.out
|
||
|
|
|
||
|
|
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
|
||
|
|
new file mode 100755
|
||
|
|
index 0000000..ff851ec
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/tests/qemu-iotests/229
|
||
|
|
@@ -0,0 +1,95 @@
|
||
|
|
+#!/bin/bash
|
||
|
|
+#
|
||
|
|
+# Test for force canceling a running blockjob that is paused in
|
||
|
|
+# an error state.
|
||
|
|
+#
|
||
|
|
+# Copyright (C) 2018 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=jcody@redhat.com
|
||
|
|
+
|
||
|
|
+seq="$(basename $0)"
|
||
|
|
+echo "QA output created by $seq"
|
||
|
|
+
|
||
|
|
+here="$PWD"
|
||
|
|
+status=1 # failure is the default!
|
||
|
|
+
|
||
|
|
+_cleanup()
|
||
|
|
+{
|
||
|
|
+ _cleanup_qemu
|
||
|
|
+ _cleanup_test_img
|
||
|
|
+ rm -f "$TEST_IMG" "$DEST_IMG"
|
||
|
|
+}
|
||
|
|
+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
|
||
|
|
+
|
||
|
|
+
|
||
|
|
+DEST_IMG="$TEST_DIR/d.$IMGFMT"
|
||
|
|
+TEST_IMG="$TEST_DIR/b.$IMGFMT"
|
||
|
|
+
|
||
|
|
+_make_test_img 2M
|
||
|
|
+
|
||
|
|
+# destination for mirror will be too small, causing error
|
||
|
|
+TEST_IMG=$DEST_IMG _make_test_img 1M
|
||
|
|
+
|
||
|
|
+$QEMU_IO -c 'write 0 2M' "$TEST_IMG" | _filter_qemu_io
|
||
|
|
+
|
||
|
|
+_launch_qemu -drive id=testdisk,file="$TEST_IMG",format="$IMGFMT"
|
||
|
|
+
|
||
|
|
+_send_qemu_cmd $QEMU_HANDLE \
|
||
|
|
+ "{'execute': 'qmp_capabilities'}" \
|
||
|
|
+ 'return'
|
||
|
|
+
|
||
|
|
+echo
|
||
|
|
+echo '=== Starting drive-mirror, causing error & stop ==='
|
||
|
|
+echo
|
||
|
|
+
|
||
|
|
+_send_qemu_cmd $QEMU_HANDLE \
|
||
|
|
+ "{'execute': 'drive-mirror',
|
||
|
|
+ 'arguments': {'device': 'testdisk',
|
||
|
|
+ 'mode': 'absolute-paths',
|
||
|
|
+ 'format': '$IMGFMT',
|
||
|
|
+ 'target': '$DEST_IMG',
|
||
|
|
+ 'sync': 'full',
|
||
|
|
+ 'mode': 'existing',
|
||
|
|
+ 'on-source-error': 'stop',
|
||
|
|
+ 'on-target-error': 'stop' }}" \
|
||
|
|
+ "JOB_STATUS_CHANGE.*pause"
|
||
|
|
+
|
||
|
|
+echo
|
||
|
|
+echo '=== Force cancel job paused in error state ==='
|
||
|
|
+echo
|
||
|
|
+
|
||
|
|
+success_or_failure="y" _send_qemu_cmd $QEMU_HANDLE \
|
||
|
|
+ "{'execute': 'block-job-cancel',
|
||
|
|
+ 'arguments': { 'device': 'testdisk',
|
||
|
|
+ 'force': true}}" \
|
||
|
|
+ "BLOCK_JOB_CANCELLED" "Assertion"
|
||
|
|
+
|
||
|
|
+# success, all done
|
||
|
|
+echo "*** done"
|
||
|
|
+rm -f $seq.full
|
||
|
|
+status=0
|
||
|
|
diff --git a/tests/qemu-iotests/229.out b/tests/qemu-iotests/229.out
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000..4c41128
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/tests/qemu-iotests/229.out
|
||
|
|
@@ -0,0 +1,23 @@
|
||
|
|
+QA output created by 229
|
||
|
|
+Formatting 'TEST_DIR/b.IMGFMT', fmt=IMGFMT size=2097152
|
||
|
|
+Formatting 'TEST_DIR/d.IMGFMT', fmt=IMGFMT size=1048576
|
||
|
|
+wrote 2097152/2097152 bytes at offset 0
|
||
|
|
+2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||
|
|
+{"return": {}}
|
||
|
|
+
|
||
|
|
+=== Starting drive-mirror, causing error & stop ===
|
||
|
|
+
|
||
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "testdisk"}}
|
||
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}}
|
||
|
|
+{"return": {}}
|
||
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "testdisk", "operation": "write", "action": "stop"}}
|
||
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id": "testdisk"}}
|
||
|
|
+
|
||
|
|
+=== Force cancel job paused in error state ===
|
||
|
|
+
|
||
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}}
|
||
|
|
+{"return": {}}
|
||
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "testdisk", "operation": "write", "action": "stop"}}
|
||
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "testdisk"}}
|
||
|
|
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "testdisk", "len": 2097152, "offset": 1048576, "speed": 0, "type": "mirror"}}
|
||
|
|
+*** done
|
||
|
|
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
|
||
|
|
index 401258f..0242b2f 100644
|
||
|
|
--- a/tests/qemu-iotests/group
|
||
|
|
+++ b/tests/qemu-iotests/group
|
||
|
|
@@ -221,3 +221,4 @@
|
||
|
|
222 rw auto quick
|
||
|
|
223 rw auto quick
|
||
|
|
226 auto quick
|
||
|
|
+229 auto quick
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|