|
|
26ba25 |
From 3ae077b6e0f0fa7d2875929ee602eef655d67181 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Date: Tue, 26 Jun 2018 09:48:31 +0200
|
|
|
26ba25 |
Subject: [PATCH 123/268] job: Add JOB_STATUS_CHANGE QMP event
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: <20180626094856.6924-49-kwolf@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81121
|
|
|
26ba25 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 48/73] job: Add JOB_STATUS_CHANGE QMP event
|
|
|
26ba25 |
Bugzilla: 1513543
|
|
|
26ba25 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
This adds a QMP event that is emitted whenever a job transitions from
|
|
|
26ba25 |
one status to another.
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit 1dac83f1a10c4c66858075970e199f4e4a8d8b71)
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
job.c | 10 +++
|
|
|
26ba25 |
qapi/job.json | 14 ++++
|
|
|
26ba25 |
tests/qemu-iotests/030 | 17 +++-
|
|
|
26ba25 |
tests/qemu-iotests/040 | 2 +
|
|
|
26ba25 |
tests/qemu-iotests/041 | 17 +++-
|
|
|
26ba25 |
tests/qemu-iotests/094.out | 7 ++
|
|
|
26ba25 |
tests/qemu-iotests/095 | 2 +-
|
|
|
26ba25 |
tests/qemu-iotests/095.out | 6 ++
|
|
|
26ba25 |
tests/qemu-iotests/109 | 2 +-
|
|
|
26ba25 |
tests/qemu-iotests/109.out | 178 ++++++++++++++++++++++++++++++++++++------
|
|
|
26ba25 |
tests/qemu-iotests/124 | 8 ++
|
|
|
26ba25 |
tests/qemu-iotests/127.out | 7 ++
|
|
|
26ba25 |
tests/qemu-iotests/141 | 13 ++-
|
|
|
26ba25 |
tests/qemu-iotests/141.out | 29 +++++++
|
|
|
26ba25 |
tests/qemu-iotests/144 | 2 +-
|
|
|
26ba25 |
tests/qemu-iotests/144.out | 7 ++
|
|
|
26ba25 |
tests/qemu-iotests/156 | 2 +-
|
|
|
26ba25 |
tests/qemu-iotests/156.out | 7 ++
|
|
|
26ba25 |
tests/qemu-iotests/185 | 12 +--
|
|
|
26ba25 |
tests/qemu-iotests/185.out | 10 +++
|
|
|
26ba25 |
tests/qemu-iotests/191 | 4 +-
|
|
|
26ba25 |
tests/qemu-iotests/191.out | 132 +++++++++++++++++++++++++++++++
|
|
|
26ba25 |
tests/qemu-iotests/iotests.py | 5 ++
|
|
|
26ba25 |
23 files changed, 449 insertions(+), 44 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/job.c b/job.c
|
|
|
26ba25 |
index 2046d2f..599a104 100644
|
|
|
26ba25 |
--- a/job.c
|
|
|
26ba25 |
+++ b/job.c
|
|
|
26ba25 |
@@ -30,6 +30,7 @@
|
|
|
26ba25 |
#include "qemu/id.h"
|
|
|
26ba25 |
#include "qemu/main-loop.h"
|
|
|
26ba25 |
#include "trace-root.h"
|
|
|
26ba25 |
+#include "qapi/qapi-events-job.h"
|
|
|
26ba25 |
|
|
|
26ba25 |
static QLIST_HEAD(, Job) jobs = QLIST_HEAD_INITIALIZER(jobs);
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -157,6 +158,11 @@ static int job_txn_apply(JobTxn *txn, int fn(Job *), bool lock)
|
|
|
26ba25 |
return rc;
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
+static bool job_is_internal(Job *job)
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ return (job->id == NULL);
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+
|
|
|
26ba25 |
static void job_state_transition(Job *job, JobStatus s1)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
JobStatus s0 = job->status;
|
|
|
26ba25 |
@@ -166,6 +172,10 @@ static void job_state_transition(Job *job, JobStatus s1)
|
|
|
26ba25 |
JobStatus_str(s0), JobStatus_str(s1));
|
|
|
26ba25 |
assert(JobSTT[s0][s1]);
|
|
|
26ba25 |
job->status = s1;
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+ if (!job_is_internal(job) && s1 != s0) {
|
|
|
26ba25 |
+ qapi_event_send_job_status_change(job->id, job->status, &error_abort);
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
int job_apply_verb(Job *job, JobVerb verb, Error **errp)
|
|
|
26ba25 |
diff --git a/qapi/job.json b/qapi/job.json
|
|
|
26ba25 |
index a472c0c..9fbdd0c 100644
|
|
|
26ba25 |
--- a/qapi/job.json
|
|
|
26ba25 |
+++ b/qapi/job.json
|
|
|
26ba25 |
@@ -92,3 +92,17 @@
|
|
|
26ba25 |
{ 'enum': 'JobVerb',
|
|
|
26ba25 |
'data': ['cancel', 'pause', 'resume', 'set-speed', 'complete', 'dismiss',
|
|
|
26ba25 |
'finalize' ] }
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+##
|
|
|
26ba25 |
+# @JOB_STATUS_CHANGE:
|
|
|
26ba25 |
+#
|
|
|
26ba25 |
+# Emitted when a job transitions to a different status.
|
|
|
26ba25 |
+#
|
|
|
26ba25 |
+# @id: The job identifier
|
|
|
26ba25 |
+# @status: The new job status
|
|
|
26ba25 |
+#
|
|
|
26ba25 |
+# Since: 2.13
|
|
|
26ba25 |
+##
|
|
|
26ba25 |
+{ 'event': 'JOB_STATUS_CHANGE',
|
|
|
26ba25 |
+ 'data': { 'id': 'str',
|
|
|
26ba25 |
+ 'status': 'JobStatus' } }
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
|
|
|
26ba25 |
index 640a6df..1dbc2dd 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/030
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/030
|
|
|
26ba25 |
@@ -304,8 +304,7 @@ class TestParallelOps(iotests.QMPTestCase):
|
|
|
26ba25 |
result = self.vm.qmp('block-stream', device='node5', base=self.imgs[3], job_id='stream-node6')
|
|
|
26ba25 |
self.assert_qmp(result, 'error/class', 'GenericError')
|
|
|
26ba25 |
|
|
|
26ba25 |
- event = self.vm.get_qmp_event(wait=True)
|
|
|
26ba25 |
- self.assertEqual(event['event'], 'BLOCK_JOB_READY')
|
|
|
26ba25 |
+ event = self.vm.event_wait(name='BLOCK_JOB_READY')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/device', 'commit-drive0')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/type', 'commit')
|
|
|
26ba25 |
self.assert_qmp_absent(event, 'data/error')
|
|
|
26ba25 |
@@ -565,6 +564,8 @@ class TestEIO(TestErrors):
|
|
|
26ba25 |
self.assert_qmp(event, 'data/offset', self.STREAM_BUFFER_SIZE)
|
|
|
26ba25 |
self.assert_qmp(event, 'data/len', self.image_len)
|
|
|
26ba25 |
completed = True
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
|
|
|
26ba25 |
self.assert_no_active_block_jobs()
|
|
|
26ba25 |
self.vm.shutdown()
|
|
|
26ba25 |
@@ -596,6 +597,8 @@ class TestEIO(TestErrors):
|
|
|
26ba25 |
self.assert_qmp(event, 'data/offset', self.image_len)
|
|
|
26ba25 |
self.assert_qmp(event, 'data/len', self.image_len)
|
|
|
26ba25 |
completed = True
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
|
|
|
26ba25 |
self.assert_no_active_block_jobs()
|
|
|
26ba25 |
self.vm.shutdown()
|
|
|
26ba25 |
@@ -637,6 +640,8 @@ class TestEIO(TestErrors):
|
|
|
26ba25 |
self.assert_qmp(event, 'data/offset', self.image_len)
|
|
|
26ba25 |
self.assert_qmp(event, 'data/len', self.image_len)
|
|
|
26ba25 |
completed = True
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
|
|
|
26ba25 |
self.assert_no_active_block_jobs()
|
|
|
26ba25 |
self.vm.shutdown()
|
|
|
26ba25 |
@@ -663,6 +668,8 @@ class TestEIO(TestErrors):
|
|
|
26ba25 |
self.assert_qmp(event, 'data/offset', self.STREAM_BUFFER_SIZE)
|
|
|
26ba25 |
self.assert_qmp(event, 'data/len', self.image_len)
|
|
|
26ba25 |
completed = True
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
|
|
|
26ba25 |
self.assert_no_active_block_jobs()
|
|
|
26ba25 |
self.vm.shutdown()
|
|
|
26ba25 |
@@ -722,6 +729,8 @@ class TestENOSPC(TestErrors):
|
|
|
26ba25 |
self.assert_qmp(event, 'data/offset', self.image_len)
|
|
|
26ba25 |
self.assert_qmp(event, 'data/len', self.image_len)
|
|
|
26ba25 |
completed = True
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
|
|
|
26ba25 |
self.assert_no_active_block_jobs()
|
|
|
26ba25 |
self.vm.shutdown()
|
|
|
26ba25 |
@@ -751,7 +760,9 @@ class TestStreamStop(iotests.QMPTestCase):
|
|
|
26ba25 |
|
|
|
26ba25 |
time.sleep(0.1)
|
|
|
26ba25 |
events = self.vm.get_qmp_events(wait=False)
|
|
|
26ba25 |
- self.assertEqual(events, [], 'unexpected QMP event: %s' % events)
|
|
|
26ba25 |
+ for e in events:
|
|
|
26ba25 |
+ self.assert_qmp(e, 'event', 'JOB_STATUS_CHANGE')
|
|
|
26ba25 |
+ self.assert_qmp(e, 'data/id', 'drive0')
|
|
|
26ba25 |
|
|
|
26ba25 |
self.cancel_and_wait(resume=True)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
|
|
|
26ba25 |
index 90b5b4f..1beb5e6 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/040
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/040
|
|
|
26ba25 |
@@ -162,6 +162,8 @@ class TestSingleDrive(ImageCommitTestCase):
|
|
|
26ba25 |
elif event['event'] == 'BLOCK_JOB_CANCELLED':
|
|
|
26ba25 |
self.assert_qmp(event, 'data/device', 'drive0')
|
|
|
26ba25 |
cancelled = True
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
else:
|
|
|
26ba25 |
self.fail("Unexpected event %s" % (event['event']))
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
|
|
|
26ba25 |
index a860a31..e945879 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/041
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/041
|
|
|
26ba25 |
@@ -445,6 +445,8 @@ new_state = "1"
|
|
|
26ba25 |
self.assert_qmp(event, 'data/device', 'drive0')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/error', 'Input/output error')
|
|
|
26ba25 |
completed = True
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
|
|
|
26ba25 |
self.assert_no_active_block_jobs()
|
|
|
26ba25 |
self.vm.shutdown()
|
|
|
26ba25 |
@@ -457,6 +459,10 @@ new_state = "1"
|
|
|
26ba25 |
self.assert_qmp(result, 'return', {})
|
|
|
26ba25 |
|
|
|
26ba25 |
event = self.vm.get_qmp_event(wait=True)
|
|
|
26ba25 |
+ while event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
+ event = self.vm.get_qmp_event(wait=True)
|
|
|
26ba25 |
+
|
|
|
26ba25 |
self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/device', 'drive0')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/operation', 'read')
|
|
|
26ba25 |
@@ -478,6 +484,10 @@ new_state = "1"
|
|
|
26ba25 |
self.assert_qmp(result, 'return', {})
|
|
|
26ba25 |
|
|
|
26ba25 |
event = self.vm.get_qmp_event(wait=True)
|
|
|
26ba25 |
+ while event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
+ event = self.vm.get_qmp_event(wait=True)
|
|
|
26ba25 |
+
|
|
|
26ba25 |
self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/device', 'drive0')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/operation', 'read')
|
|
|
26ba25 |
@@ -608,7 +618,7 @@ new_state = "1"
|
|
|
26ba25 |
on_target_error='ignore')
|
|
|
26ba25 |
self.assert_qmp(result, 'return', {})
|
|
|
26ba25 |
|
|
|
26ba25 |
- event = self.vm.get_qmp_event(wait=True)
|
|
|
26ba25 |
+ event = self.vm.event_wait(name='BLOCK_JOB_ERROR')
|
|
|
26ba25 |
self.assertEquals(event['event'], 'BLOCK_JOB_ERROR')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/device', 'drive0')
|
|
|
26ba25 |
self.assert_qmp(event, 'data/operation', 'write')
|
|
|
26ba25 |
@@ -784,7 +794,12 @@ class TestGranularity(iotests.QMPTestCase):
|
|
|
26ba25 |
sync='full', target=target_img,
|
|
|
26ba25 |
mode='absolute-paths', granularity=8192)
|
|
|
26ba25 |
self.assert_qmp(result, 'return', {})
|
|
|
26ba25 |
+
|
|
|
26ba25 |
event = self.vm.get_qmp_event(wait=60.0)
|
|
|
26ba25 |
+ while event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', 'drive0')
|
|
|
26ba25 |
+ event = self.vm.get_qmp_event(wait=60.0)
|
|
|
26ba25 |
+
|
|
|
26ba25 |
# Failures will manifest as COMPLETED/ERROR.
|
|
|
26ba25 |
self.assert_qmp(event, 'event', 'BLOCK_JOB_READY')
|
|
|
26ba25 |
self.complete_and_wait(drive='drive0', wait_ready=False)
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/094.out b/tests/qemu-iotests/094.out
|
|
|
26ba25 |
index f52baff..665b630 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/094.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/094.out
|
|
|
26ba25 |
@@ -2,10 +2,17 @@ QA output created by 094
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
Formatting 'TEST_DIR/source.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 67108864, "offset": 67108864, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 67108864, "offset": 67108864, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
*** done
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
|
|
|
26ba25 |
index 030adb2..72ecc22 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/095
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/095
|
|
|
26ba25 |
@@ -72,7 +72,7 @@ _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" "return"
|
|
|
26ba25 |
|
|
|
26ba25 |
_send_qemu_cmd $h "{ 'execute': 'block-commit',
|
|
|
26ba25 |
'arguments': { 'device': 'test',
|
|
|
26ba25 |
- 'top': '"${TEST_IMG}.snp1"' } }" "BLOCK_JOB_COMPLETED"
|
|
|
26ba25 |
+ 'top': '"${TEST_IMG}.snp1"' } }" '"status": "null"'
|
|
|
26ba25 |
|
|
|
26ba25 |
_cleanup_qemu
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/095.out b/tests/qemu-iotests/095.out
|
|
|
26ba25 |
index 73875ca..8c093df 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/095.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/095.out
|
|
|
26ba25 |
@@ -11,8 +11,14 @@ virtual size: 5.0M (5242880 bytes)
|
|
|
26ba25 |
=== Running QEMU Live Commit Test ===
|
|
|
26ba25 |
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "test"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "test"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "test"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "test"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "test", "len": 104857600, "offset": 104857600, "speed": 0, "type": "commit"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "test"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "test"}}
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Base image info after commit and resize ===
|
|
|
26ba25 |
image: TEST_DIR/t.IMGFMT.base
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
|
|
|
26ba25 |
index d70b574..acbd079 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/109
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/109
|
|
|
26ba25 |
@@ -64,7 +64,7 @@ function run_qemu()
|
|
|
26ba25 |
|
|
|
26ba25 |
_send_qemu_cmd $QEMU_HANDLE '' "$qmp_event"
|
|
|
26ba25 |
if test "$qmp_event" = BLOCK_JOB_ERROR; then
|
|
|
26ba25 |
- _send_qemu_cmd $QEMU_HANDLE '' "BLOCK_JOB_COMPLETED"
|
|
|
26ba25 |
+ _send_qemu_cmd $QEMU_HANDLE '' '"status": "null"'
|
|
|
26ba25 |
fi
|
|
|
26ba25 |
_send_qemu_cmd $QEMU_HANDLE '{"execute":"query-block-jobs"}' "return"
|
|
|
26ba25 |
_send_qemu_cmd $QEMU_HANDLE '{"execute":"quit"}' "return"
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/109.out b/tests/qemu-iotests/109.out
|
|
|
26ba25 |
index 8a9b936..ad0ee6f 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/109.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/109.out
|
|
|
26ba25 |
@@ -6,23 +6,35 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 1024, "offset": 1024, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 1024, "offset": 1024, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 1024, "offset": 1024, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -32,23 +44,35 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 512, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 197120, "offset": 197120, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 197120, "offset": 197120, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 197120, "offset": 197120, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -58,23 +82,35 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 262144, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 327680, "offset": 327680, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 327680, "offset": 327680, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 327680, "offset": 327680, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -84,23 +120,35 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 1024, "offset": 1024, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 1024, "offset": 1024, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 1024, "offset": 1024, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -110,23 +158,35 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 65536, "offset": 65536, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 65536, "offset": 65536, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 65536, "offset": 65536, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -136,23 +196,35 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.raw.src', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": 0, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 2560, "offset": 2560, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 2560, "offset": 2560, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2560, "offset": 2560, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -161,23 +233,35 @@ Images are identical.
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 2560, "offset": 2560, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 2560, "offset": 2560, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2560, "offset": 2560, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -186,23 +270,35 @@ Images are identical.
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 31457280, "offset": 31457280, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 31457280, "offset": 31457280, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 31457280, "offset": 31457280, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -211,23 +307,35 @@ Images are identical.
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 327680, "offset": 327680, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 327680, "offset": 327680, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 327680, "offset": 327680, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -236,23 +344,35 @@ Images are identical.
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_ERROR", "data": {"device": "src", "operation": "write", "action": "report"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": LEN, "offset": OFFSET, "speed": 0, "type": "mirror", "error": "Operation not permitted"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
{"return": []}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 2048, "offset": 2048, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 2048, "offset": 2048, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 2048, "offset": 2048, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -261,23 +381,37 @@ Images are identical.
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
WARNING: Image format was not specified for 'TEST_DIR/t.raw' and probing guessed raw.
|
|
|
26ba25 |
-Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
-Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+ Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted.
|
|
|
26ba25 |
+ Specify the 'raw' format explicitly to remove the restrictions.
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 512, "offset": 512, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 512, "offset": 512, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 512, "offset": 512, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "src"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 512, "offset": 512, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": [{"auto-finalize": true, "io-status": "ok", "device": "src", "auto-dismiss": true, "busy": false, "len": 512, "offset": 512, "status": "ready", "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "src"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "src", "len": 512, "offset": 512, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "src"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "src"}}
|
|
|
26ba25 |
Warning: Image size mismatch!
|
|
|
26ba25 |
Images are identical.
|
|
|
26ba25 |
*** done
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
|
|
|
26ba25 |
index 8e76e62..3ea4ac5 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/124
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/124
|
|
|
26ba25 |
@@ -151,10 +151,17 @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
|
|
|
26ba25 |
return self.wait_qmp_backup(kwargs['device'], error)
|
|
|
26ba25 |
|
|
|
26ba25 |
|
|
|
26ba25 |
+ def ignore_job_status_change_events(self):
|
|
|
26ba25 |
+ while True:
|
|
|
26ba25 |
+ e = self.vm.event_wait(name="JOB_STATUS_CHANGE")
|
|
|
26ba25 |
+ if e['data']['status'] == 'null':
|
|
|
26ba25 |
+ break
|
|
|
26ba25 |
+
|
|
|
26ba25 |
def wait_qmp_backup(self, device, error='Input/output error'):
|
|
|
26ba25 |
event = self.vm.event_wait(name="BLOCK_JOB_COMPLETED",
|
|
|
26ba25 |
match={'data': {'device': device}})
|
|
|
26ba25 |
self.assertNotEqual(event, None)
|
|
|
26ba25 |
+ self.ignore_job_status_change_events()
|
|
|
26ba25 |
|
|
|
26ba25 |
try:
|
|
|
26ba25 |
failure = self.dictpath(event, 'data/error')
|
|
|
26ba25 |
@@ -172,6 +179,7 @@ class TestIncrementalBackupBase(iotests.QMPTestCase):
|
|
|
26ba25 |
event = self.vm.event_wait(name='BLOCK_JOB_CANCELLED',
|
|
|
26ba25 |
match={'data': {'device': device}})
|
|
|
26ba25 |
self.assertNotEqual(event, None)
|
|
|
26ba25 |
+ self.ignore_job_status_change_events()
|
|
|
26ba25 |
|
|
|
26ba25 |
|
|
|
26ba25 |
def create_anchor_backup(self, drive=None):
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/127.out b/tests/qemu-iotests/127.out
|
|
|
26ba25 |
index 543d075..83b522d 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/127.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/127.out
|
|
|
26ba25 |
@@ -5,10 +5,17 @@ Formatting 'TEST_DIR/t.IMGFMT.overlay1', fmt=IMGFMT size=65536 backing_file=TEST
|
|
|
26ba25 |
wrote 42/42 bytes at offset 0
|
|
|
26ba25 |
42 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "mirror"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "mirror"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "mirror", "len": 65536, "offset": 65536, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "mirror"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "mirror", "len": 65536, "offset": 65536, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "mirror"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
*** done
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
|
|
|
26ba25 |
index 2f9d7b9..4246d38 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/141
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/141
|
|
|
26ba25 |
@@ -107,7 +107,7 @@ test_blockjob \
|
|
|
26ba25 |
'format': '$IMGFMT',
|
|
|
26ba25 |
'sync': 'none'}}" \
|
|
|
26ba25 |
'return' \
|
|
|
26ba25 |
- 'BLOCK_JOB_CANCELLED'
|
|
|
26ba25 |
+ '"status": "null"'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo '=== Testing drive-mirror ==='
|
|
|
26ba25 |
@@ -124,7 +124,7 @@ test_blockjob \
|
|
|
26ba25 |
'format': '$IMGFMT',
|
|
|
26ba25 |
'sync': 'none'}}" \
|
|
|
26ba25 |
'BLOCK_JOB_READY' \
|
|
|
26ba25 |
- 'BLOCK_JOB_COMPLETED'
|
|
|
26ba25 |
+ '"status": "null"'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo '=== Testing active block-commit ==='
|
|
|
26ba25 |
@@ -138,7 +138,7 @@ test_blockjob \
|
|
|
26ba25 |
"{'execute': 'block-commit',
|
|
|
26ba25 |
'arguments': {'job-id': 'job0', 'device': 'drv0'}}" \
|
|
|
26ba25 |
'BLOCK_JOB_READY' \
|
|
|
26ba25 |
- 'BLOCK_JOB_COMPLETED'
|
|
|
26ba25 |
+ '"status": "null"'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo '=== Testing non-active block-commit ==='
|
|
|
26ba25 |
@@ -157,7 +157,7 @@ test_blockjob \
|
|
|
26ba25 |
'top': '$TEST_DIR/m.$IMGFMT',
|
|
|
26ba25 |
'speed': 1}}" \
|
|
|
26ba25 |
'return' \
|
|
|
26ba25 |
- 'BLOCK_JOB_CANCELLED'
|
|
|
26ba25 |
+ '"status": "null"'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo '=== Testing block-stream ==='
|
|
|
26ba25 |
@@ -170,8 +170,7 @@ echo
|
|
|
26ba25 |
$QEMU_IO -c 'write 0 1M' "$TEST_DIR/b.$IMGFMT" | _filter_qemu_io
|
|
|
26ba25 |
|
|
|
26ba25 |
# With some data to stream (and @speed set to 1), block-stream will not complete
|
|
|
26ba25 |
-# until we send the block-job-cancel command. Therefore, no event other than
|
|
|
26ba25 |
-# BLOCK_JOB_CANCELLED will be emitted.
|
|
|
26ba25 |
+# until we send the block-job-cancel command.
|
|
|
26ba25 |
|
|
|
26ba25 |
test_blockjob \
|
|
|
26ba25 |
"{'execute': 'block-stream',
|
|
|
26ba25 |
@@ -179,7 +178,7 @@ test_blockjob \
|
|
|
26ba25 |
'device': 'drv0',
|
|
|
26ba25 |
'speed': 1}}" \
|
|
|
26ba25 |
'return' \
|
|
|
26ba25 |
- 'BLOCK_JOB_CANCELLED'
|
|
|
26ba25 |
+ '"status": "null"'
|
|
|
26ba25 |
|
|
|
26ba25 |
_cleanup_qemu
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/141.out b/tests/qemu-iotests/141.out
|
|
|
26ba25 |
index 82e763b..f252c86 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/141.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/141.out
|
|
|
26ba25 |
@@ -8,31 +8,50 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/m.
|
|
|
26ba25 |
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 0, "speed": 0, "type": "backup"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Testing drive-mirror ===
|
|
|
26ba25 |
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: node is used as backing hd of 'NODE_NAME'"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Testing active block-commit ===
|
|
|
26ba25 |
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "job0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: node is used as backing hd of 'NODE_NAME'"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Testing non-active block-commit ===
|
|
|
26ba25 |
@@ -40,10 +59,15 @@ Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.
|
|
|
26ba25 |
wrote 1048576/1048576 bytes at offset 0
|
|
|
26ba25 |
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 524288, "speed": 1, "type": "commit"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Testing block-stream ===
|
|
|
26ba25 |
@@ -51,9 +75,14 @@ wrote 1048576/1048576 bytes at offset 0
|
|
|
26ba25 |
wrote 1048576/1048576 bytes at offset 0
|
|
|
26ba25 |
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"error": {"class": "GenericError", "desc": "Node drv0 is in use"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "aborting", "id": "job0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_CANCELLED", "data": {"device": "job0", "len": 1048576, "offset": 524288, "speed": 1, "type": "stream"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
*** done
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
|
|
|
26ba25 |
index 00de3c33..4b91571 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/144
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/144
|
|
|
26ba25 |
@@ -93,7 +93,7 @@ _send_qemu_cmd $h "{ 'execute': 'block-job-complete',
|
|
|
26ba25 |
'arguments': {
|
|
|
26ba25 |
'device': 'virtio0'
|
|
|
26ba25 |
}
|
|
|
26ba25 |
- }" "COMPLETED"
|
|
|
26ba25 |
+ }" '"status": "null"'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo === Performing Live Snapshot 2 ===
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/144.out b/tests/qemu-iotests/144.out
|
|
|
26ba25 |
index 014b281..5529920 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/144.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/144.out
|
|
|
26ba25 |
@@ -12,10 +12,17 @@ Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Performing block-commit on active layer ===
|
|
|
26ba25 |
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "virtio0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "virtio0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "virtio0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "virtio0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "virtio0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "virtio0"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "virtio0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "virtio0"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "virtio0"}}
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Performing Live Snapshot 2 ===
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
|
|
|
26ba25 |
index e75dc4d..0a9a098 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/156
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/156
|
|
|
26ba25 |
@@ -119,7 +119,7 @@ _send_qemu_cmd $QEMU_HANDLE \
|
|
|
26ba25 |
|
|
|
26ba25 |
_send_qemu_cmd $QEMU_HANDLE \
|
|
|
26ba25 |
'' \
|
|
|
26ba25 |
- 'BLOCK_JOB_COMPLETED'
|
|
|
26ba25 |
+ '"status": "null"'
|
|
|
26ba25 |
|
|
|
26ba25 |
# Remove the source images
|
|
|
26ba25 |
rm -f "$TEST_IMG{,.backing,.overlay}"
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/156.out b/tests/qemu-iotests/156.out
|
|
|
26ba25 |
index f96a564..34c057b 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/156.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/156.out
|
|
|
26ba25 |
@@ -12,13 +12,20 @@ wrote 131072/131072 bytes at offset 131072
|
|
|
26ba25 |
128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": ""}
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.IMGFMT.target.overlay', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.target
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "source"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "source"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "ready", "id": "source"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "source", "len": 131072, "offset": 131072, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
wrote 65536/65536 bytes at offset 196608
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
{"return": ""}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "source"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "source"}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "source", "len": 196608, "offset": 196608, "speed": 0, "type": "mirror"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "source"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "source"}}
|
|
|
26ba25 |
|
|
|
26ba25 |
read 65536/65536 bytes at offset 0
|
|
|
26ba25 |
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
|
|
|
26ba25 |
index 9a2d317..567ba67 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/185
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/185
|
|
|
26ba25 |
@@ -118,8 +118,10 @@ _send_qemu_cmd $h \
|
|
|
26ba25 |
# If we don't sleep here 'quit' command races with disk I/O
|
|
|
26ba25 |
sleep 0.5
|
|
|
26ba25 |
|
|
|
26ba25 |
+# Ignore the JOB_STATUS_CHANGE events while shutting down the VM. Depending on
|
|
|
26ba25 |
+# the timing, jobs may or may not transition through a paused state.
|
|
|
26ba25 |
_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"
|
|
|
26ba25 |
-wait=1 _cleanup_qemu
|
|
|
26ba25 |
+wait=1 _cleanup_qemu | grep -v 'JOB_STATUS_CHANGE'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo === Start active commit job and exit qemu ===
|
|
|
26ba25 |
@@ -141,7 +143,7 @@ _send_qemu_cmd $h \
|
|
|
26ba25 |
sleep 0.5
|
|
|
26ba25 |
|
|
|
26ba25 |
_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"
|
|
|
26ba25 |
-wait=1 _cleanup_qemu
|
|
|
26ba25 |
+wait=1 _cleanup_qemu | grep -v 'JOB_STATUS_CHANGE'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo === Start mirror job and exit qemu ===
|
|
|
26ba25 |
@@ -166,7 +168,7 @@ _send_qemu_cmd $h \
|
|
|
26ba25 |
sleep 0.5
|
|
|
26ba25 |
|
|
|
26ba25 |
_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"
|
|
|
26ba25 |
-wait=1 _cleanup_qemu
|
|
|
26ba25 |
+wait=1 _cleanup_qemu | grep -v 'JOB_STATUS_CHANGE'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo === Start backup job and exit qemu ===
|
|
|
26ba25 |
@@ -190,7 +192,7 @@ _send_qemu_cmd $h \
|
|
|
26ba25 |
sleep 0.5
|
|
|
26ba25 |
|
|
|
26ba25 |
_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"
|
|
|
26ba25 |
-wait=1 _cleanup_qemu
|
|
|
26ba25 |
+wait=1 _cleanup_qemu | grep -v 'JOB_STATUS_CHANGE'
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
echo === Start streaming job and exit qemu ===
|
|
|
26ba25 |
@@ -211,7 +213,7 @@ _send_qemu_cmd $h \
|
|
|
26ba25 |
sleep 0.5
|
|
|
26ba25 |
|
|
|
26ba25 |
_send_qemu_cmd $h "{ 'execute': 'quit' }" "return"
|
|
|
26ba25 |
-wait=1 _cleanup_qemu
|
|
|
26ba25 |
+wait=1 _cleanup_qemu | grep -v 'JOB_STATUS_CHANGE'
|
|
|
26ba25 |
|
|
|
26ba25 |
_check_test_img
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/185.out b/tests/qemu-iotests/185.out
|
|
|
26ba25 |
index 57eaf8d..4e0ca0d 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/185.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/185.out
|
|
|
26ba25 |
@@ -17,6 +17,8 @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 backing_file=TEST_DIR/t.q
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Start commit job and exit qemu ===
|
|
|
26ba25 |
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "disk"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "disk"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
@@ -25,6 +27,8 @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 backing_file=TEST_DIR/t.q
|
|
|
26ba25 |
=== Start active commit job and exit qemu ===
|
|
|
26ba25 |
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "disk"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "disk"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
@@ -34,6 +38,8 @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 backing_file=TEST_DIR/t.q
|
|
|
26ba25 |
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 size=67108864 cluster_size=65536 lazy_refcounts=off refcount_bits=16
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "disk"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "disk"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
@@ -43,6 +49,8 @@ Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 size=67108864 cluster_size=65536 l
|
|
|
26ba25 |
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 size=67108864 cluster_size=65536 lazy_refcounts=off refcount_bits=16
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "disk"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "disk"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
@@ -51,6 +59,8 @@ Formatting 'TEST_DIR/t.qcow2.copy', fmt=qcow2 size=67108864 cluster_size=65536 l
|
|
|
26ba25 |
=== Start streaming job and exit qemu ===
|
|
|
26ba25 |
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "disk"}}
|
|
|
26ba25 |
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "disk"}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"return": {}}
|
|
|
26ba25 |
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false}}
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
|
|
|
26ba25 |
index dfad655..b3629ff 100755
|
|
|
26ba25 |
--- a/tests/qemu-iotests/191
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/191
|
|
|
26ba25 |
@@ -83,7 +83,7 @@ _send_qemu_cmd $h \
|
|
|
26ba25 |
'device': 'top',
|
|
|
26ba25 |
'base':'$TEST_IMG.base',
|
|
|
26ba25 |
'top': '$TEST_IMG.mid' } }" \
|
|
|
26ba25 |
- "BLOCK_JOB_COMPLETED"
|
|
|
26ba25 |
+ '"status": "null"'
|
|
|
26ba25 |
_send_qemu_cmd $h "" "^}"
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
@@ -131,7 +131,7 @@ _send_qemu_cmd $h \
|
|
|
26ba25 |
'device': 'top',
|
|
|
26ba25 |
'base':'$TEST_IMG.base',
|
|
|
26ba25 |
'top': '$TEST_IMG.mid' } }" \
|
|
|
26ba25 |
- "BLOCK_JOB_COMPLETED"
|
|
|
26ba25 |
+ '"status": "null"'
|
|
|
26ba25 |
_send_qemu_cmd $h "" "^}"
|
|
|
26ba25 |
|
|
|
26ba25 |
echo
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/191.out b/tests/qemu-iotests/191.out
|
|
|
26ba25 |
index 190c5f0..31a0c7d 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/191.out
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/191.out
|
|
|
26ba25 |
@@ -16,6 +16,28 @@ wrote 65536/65536 bytes at offset 1048576
|
|
|
26ba25 |
=== Perform commit job ===
|
|
|
26ba25 |
|
|
|
26ba25 |
{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "created",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "running",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
"return": {
|
|
|
26ba25 |
}
|
|
|
26ba25 |
}
|
|
|
26ba25 |
@@ -24,6 +46,28 @@ wrote 65536/65536 bytes at offset 1048576
|
|
|
26ba25 |
"seconds": TIMESTAMP,
|
|
|
26ba25 |
"microseconds": TIMESTAMP
|
|
|
26ba25 |
},
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "waiting",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "pending",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
"event": "BLOCK_JOB_COMPLETED",
|
|
|
26ba25 |
"data": {
|
|
|
26ba25 |
"device": "commit0",
|
|
|
26ba25 |
@@ -33,6 +77,28 @@ wrote 65536/65536 bytes at offset 1048576
|
|
|
26ba25 |
"type": "commit"
|
|
|
26ba25 |
}
|
|
|
26ba25 |
}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "concluded",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "null",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Check that both top and top2 point to base now ===
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -356,6 +422,28 @@ wrote 65536/65536 bytes at offset 1048576
|
|
|
26ba25 |
=== Perform commit job ===
|
|
|
26ba25 |
|
|
|
26ba25 |
{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "created",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "running",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
"return": {
|
|
|
26ba25 |
}
|
|
|
26ba25 |
}
|
|
|
26ba25 |
@@ -364,6 +452,28 @@ wrote 65536/65536 bytes at offset 1048576
|
|
|
26ba25 |
"seconds": TIMESTAMP,
|
|
|
26ba25 |
"microseconds": TIMESTAMP
|
|
|
26ba25 |
},
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "waiting",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "pending",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
"event": "BLOCK_JOB_COMPLETED",
|
|
|
26ba25 |
"data": {
|
|
|
26ba25 |
"device": "commit0",
|
|
|
26ba25 |
@@ -373,6 +483,28 @@ wrote 65536/65536 bytes at offset 1048576
|
|
|
26ba25 |
"type": "commit"
|
|
|
26ba25 |
}
|
|
|
26ba25 |
}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "concluded",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
+{
|
|
|
26ba25 |
+ "timestamp": {
|
|
|
26ba25 |
+ "seconds": TIMESTAMP,
|
|
|
26ba25 |
+ "microseconds": TIMESTAMP
|
|
|
26ba25 |
+ },
|
|
|
26ba25 |
+ "event": "JOB_STATUS_CHANGE",
|
|
|
26ba25 |
+ "data": {
|
|
|
26ba25 |
+ "status": "null",
|
|
|
26ba25 |
+ "id": "commit0"
|
|
|
26ba25 |
+ }
|
|
|
26ba25 |
+}
|
|
|
26ba25 |
|
|
|
26ba25 |
=== Check that both top and top2 point to base now ===
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
|
|
26ba25 |
index 2ce85a1..824f87d 100644
|
|
|
26ba25 |
--- a/tests/qemu-iotests/iotests.py
|
|
|
26ba25 |
+++ b/tests/qemu-iotests/iotests.py
|
|
|
26ba25 |
@@ -474,6 +474,9 @@ class QMPTestCase(unittest.TestCase):
|
|
|
26ba25 |
self.assert_qmp(event, 'data/device', drive)
|
|
|
26ba25 |
result = event
|
|
|
26ba25 |
cancelled = True
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', drive)
|
|
|
26ba25 |
+
|
|
|
26ba25 |
|
|
|
26ba25 |
self.assert_no_active_block_jobs()
|
|
|
26ba25 |
return result
|
|
|
26ba25 |
@@ -489,6 +492,8 @@ class QMPTestCase(unittest.TestCase):
|
|
|
26ba25 |
self.assert_qmp(event, 'data/offset', event['data']['len'])
|
|
|
26ba25 |
self.assert_no_active_block_jobs()
|
|
|
26ba25 |
return event
|
|
|
26ba25 |
+ elif event['event'] == 'JOB_STATUS_CHANGE':
|
|
|
26ba25 |
+ self.assert_qmp(event, 'data/id', drive)
|
|
|
26ba25 |
|
|
|
26ba25 |
def wait_ready(self, drive='drive0'):
|
|
|
26ba25 |
'''Wait until a block job BLOCK_JOB_READY event'''
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|