mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
iQIcBAABAgAGBQJbfNs2AAoJEL2+eyfA3jBXTcYQALp0YVA8U5n3bH3nnNEUgK2h
 EXG3ZCozEK+bNk1+kz3SfW3WVmfVYcnoA9RW2bZXU+fId0RsQ+iP9ClvwRnYV8ur
 UAQVNQfAFbfNqfP1hilx6JIXzHI3oOjPeDyk4p1s/cXQFZxo3KFG9wRmFGbHOgR4
 UPvZBPLEJB4JmwbojeS+RVCkoOcfXjLwBMRSKFuO6dOdo6pnyjtUcqb4nErLV+aN
 tT33B2VgLzRxnqVJkGdtI91WUzbLMou4NzCrF/ItDaZv6qCXnnft4MoAjN+bTLLo
 wEwavNqPjX2ke2EFloYIhEO98xuQVvcftXEveAoBZwv3qkj5bUUbHWbFUSxWWNv+
 l5+sK8IGP41CmLbZ3Lih5bANR9Bc1R+2JbJgBoLibgGj/Fapo0M2llWDQtCCJall
 qdQvn8wwhFhFOmE4pKmh9DeV72plG33rY9vH1jgdFr0UqgM7e1ihojmt/xb+Nqoe
 AlXLlsfwY9HvAku/GRbChJ/aS0CKhd4B1n47Ed5AnLiCd4yfMdQ173mX6o0hCmQG
 Jv0p3LkdZCrb/1Pqj0MRh6vywd027pLVLnJULcF2Q6+1tSyANSPLH/iyaC1aKuJz
 a4rRGefdDC58KdaYBnNeUlSlP/mFwi0kvsp++m3Bgysq143rhXeUQLYtlmNYfh4V
 WdnPdROJqXLgOW8SsCC6
 =iaPo
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging

# gpg: Signature made Wed 22 Aug 2018 04:40:38 BST
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  block: iotest to catch abort on forced blockjob cancel
  block: for jobs, do not clear user_paused until after the resume

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-08-23 17:35:48 +01:00
commit 5ccac548fa
4 changed files with 120 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
job.c
View File

@ -732,10 +732,10 @@ static void job_cancel_async(Job *job, bool force)
{
if (job->user_paused) {
/* Do not call job_enter here, the caller will handle it. */
job->user_paused = false;
if (job->driver->user_resume) {
job->driver->user_resume(job);
}
job->user_paused = false;
assert(job->pause_count > 0);
job->pause_count--;
}

95
tests/qemu-iotests/229 Executable file
View File

@ -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

23
tests/qemu-iotests/229.out Normal file
View File

@ -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

1
tests/qemu-iotests/group
View File

@ -225,3 +225,4 @@
225 rw auto quick
226 auto quick
227 auto quick
229 auto quick