* [Qemu-devel] [PATCH v2 0/2] block: for jobs, do not clear user_paused until after the resume
@ 2018-08-16 18:46 Jeff Cody
2018-08-16 18:46 ` [Qemu-devel] [PATCH v2 1/2] " Jeff Cody
2018-08-16 18:46 ` [Qemu-devel] [PATCH v2 2/2] block: iotest to catch abort on forced blockjob cancel Jeff Cody
0 siblings, 2 replies; 5+ messages in thread
From: Jeff Cody @ 2018-08-16 18:46 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, qemu-stable, jsnow, eblake
v2 changes:
Patch 1: Added r-b from John, Eric (Thanks)
Patch 2: Attached an iotest as patch 2
* cc'ed qemu-stable
For the test in patch 2, failure here is the failure output w/o patch 1:
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "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": "aborting", "id": "testdisk"}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "testdisk", "len": 2097152, "offset": 1048576, "speed": 0, "type": "mirror"}}
-*** done
+QEMU_PROG: blockjob.c:460: block_job_iostatus_reset: Assertion `job->job.user_paused && job->job.pause_count > 0' failed.
+Wrong response matching Assertion on handle 0
Failures: 229
Failed 1 of 1 tests
git-backport-diff from v1:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch
[down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/2:[----] [--] 'block: for jobs, do not clear user_paused until after the resume'
002/2:[down] 'block: iotest to catch abort on forced blockjob cancel'
Jeff Cody (2):
block: for jobs, do not clear user_paused until after the resume
block: iotest to catch abort on forced blockjob cancel
job.c | 2 +-
tests/qemu-iotests/229 | 95 ++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/229.out | 23 +++++++++
tests/qemu-iotests/group | 1 +
4 files changed, 120 insertions(+), 1 deletion(-)
create mode 100755 tests/qemu-iotests/229
create mode 100644 tests/qemu-iotests/229.out
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH v2 1/2] block: for jobs, do not clear user_paused until after the resume
2018-08-16 18:46 [Qemu-devel] [PATCH v2 0/2] block: for jobs, do not clear user_paused until after the resume Jeff Cody
@ 2018-08-16 18:46 ` Jeff Cody
2018-08-16 18:46 ` [Qemu-devel] [PATCH v2 2/2] block: iotest to catch abort on forced blockjob cancel Jeff Cody
1 sibling, 0 replies; 5+ messages in thread
From: Jeff Cody @ 2018-08-16 18:46 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, qemu-stable, jsnow, eblake
The function job_cancel_async() will always cause an assert for blockjob
user resume. We set job->user_paused to false, and then call
job->driver->user_resume(). In the case of blockjobs, this is the
block_job_user_resume() function.
In that function, we assert that job.user_paused is set to true.
Unfortunately, right before calling this function, it has explicitly
been set to false.
The fix is pretty simple: set job->user_paused to false only after the
job user_resume() function has been called.
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
job.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/job.c b/job.c
index fa671b431a..e36ebaafd8 100644
--- a/job.c
+++ b/job.c
@@ -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--;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH v2 2/2] block: iotest to catch abort on forced blockjob cancel
2018-08-16 18:46 [Qemu-devel] [PATCH v2 0/2] block: for jobs, do not clear user_paused until after the resume Jeff Cody
2018-08-16 18:46 ` [Qemu-devel] [PATCH v2 1/2] " Jeff Cody
@ 2018-08-16 18:46 ` Jeff Cody
2018-08-20 21:26 ` John Snow
1 sibling, 1 reply; 5+ messages in thread
From: Jeff Cody @ 2018-08-16 18:46 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, qemu-stable, jsnow, eblake
Signed-off-by: Jeff Cody <jcody@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 0000000000..2af04c8028
--- /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': 'qcow2',
+ 'target': '$DEST_IMG',
+ 'sync': 'full',
+ 'mode': 'existing',
+ 'on-source-error': 'stop',
+ 'on-target-error': 'stop' }}" \
+ "BLOCK_JOB_ERROR"
+
+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 0000000000..d5dea5cdd2
--- /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"}}
+
+=== Force cancel job paused in error state ===
+
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "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": "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 b973dc842d..743790745b 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -225,3 +225,4 @@
225 rw auto quick
226 auto quick
227 auto quick
+229 auto quick
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/2] block: iotest to catch abort on forced blockjob cancel
2018-08-16 18:46 ` [Qemu-devel] [PATCH v2 2/2] block: iotest to catch abort on forced blockjob cancel Jeff Cody
@ 2018-08-20 21:26 ` John Snow
2018-08-21 16:16 ` Jeff Cody
0 siblings, 1 reply; 5+ messages in thread
From: John Snow @ 2018-08-20 21:26 UTC (permalink / raw)
To: Jeff Cody, qemu-devel; +Cc: qemu-stable, qemu-block
On 08/16/2018 02:46 PM, Jeff Cody wrote:
> Signed-off-by: Jeff Cody <jcody@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 0000000000..2af04c8028
> --- /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': 'qcow2',
> + 'target': '$DEST_IMG',
> + 'sync': 'full',
> + 'mode': 'existing',
> + 'on-source-error': 'stop',
> + 'on-target-error': 'stop' }}" \
> + "BLOCK_JOB_ERROR"
> +
> +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 0000000000..d5dea5cdd2
> --- /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"}}
> +
> +=== Force cancel job paused in error state ===
> +
> +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id": "testdisk"}}
Is this a race? I imagine the job pauses itself as a result of the error
it just signaled, so the pause event generally occurs before we start
attempting to force cancel, and then:
> +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}}
> +{"return": {}}
These two lines are actually the first that should belong to this
heading, and then:
> +{"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"}}
These three follow directly after the force cancellation.
Am I misinterpreting the output?
> +*** done
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index b973dc842d..743790745b 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -225,3 +225,4 @@
> 225 rw auto quick
> 226 auto quick
> 227 auto quick
> +229 auto quick
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/2] block: iotest to catch abort on forced blockjob cancel
2018-08-20 21:26 ` John Snow
@ 2018-08-21 16:16 ` Jeff Cody
0 siblings, 0 replies; 5+ messages in thread
From: Jeff Cody @ 2018-08-21 16:16 UTC (permalink / raw)
To: John Snow; +Cc: qemu-devel, qemu-stable, qemu-block
On Mon, Aug 20, 2018 at 05:26:23PM -0400, John Snow wrote:
>
>
> On 08/16/2018 02:46 PM, Jeff Cody wrote:
> > Signed-off-by: Jeff Cody <jcody@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 0000000000..2af04c8028
> > --- /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': 'qcow2',
> > + 'target': '$DEST_IMG',
> > + 'sync': 'full',
> > + 'mode': 'existing',
> > + 'on-source-error': 'stop',
> > + 'on-target-error': 'stop' }}" \
> > + "BLOCK_JOB_ERROR"
> > +
> > +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 0000000000..d5dea5cdd2
> > --- /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"}}
> > +
> > +=== Force cancel job paused in error state ===
> > +
> > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "paused", "id": "testdisk"}}
>
> Is this a race? I imagine the job pauses itself as a result of the error
> it just signaled, so the pause event generally occurs before we start
> attempting to force cancel, and then:
>
> > +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}}
> > +{"return": {}}
>
> These two lines are actually the first that should belong to this
> heading, and then:
>
> > +{"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"}}
>
> These three follow directly after the force cancellation.
>
> Am I misinterpreting the output?
Not misinterpreting it per se, but it isn't a race condition. It is a
side effect of the common.qemu process stdout buffer - that output was still
in the pipeline, and was printed while we waited for the
"BLOCK_JOB_CANCELLED".
If I had structured the test 229 to wait for "JOB_STATUS_CHANGE.*paused"
instead of "BLOCK_JOB_ERROR" when doing the mirror, then you wouldn't see
that oddity, because it would have been consumed.
Would you like me to spin a v3 with that change in the iotests? Actually,
I'll go ahead and do that whether you want me to or not :)
>
> > +*** done
> > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> > index b973dc842d..743790745b 100644
> > --- a/tests/qemu-iotests/group
> > +++ b/tests/qemu-iotests/group
> > @@ -225,3 +225,4 @@
> > 225 rw auto quick
> > 226 auto quick
> > 227 auto quick
> > +229 auto quick
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-08-21 16:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-16 18:46 [Qemu-devel] [PATCH v2 0/2] block: for jobs, do not clear user_paused until after the resume Jeff Cody
2018-08-16 18:46 ` [Qemu-devel] [PATCH v2 1/2] " Jeff Cody
2018-08-16 18:46 ` [Qemu-devel] [PATCH v2 2/2] block: iotest to catch abort on forced blockjob cancel Jeff Cody
2018-08-20 21:26 ` John Snow
2018-08-21 16:16 ` Jeff Cody
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).