[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/29] qemu-iotests: Test block-stream and block-comm
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 20/29] qemu-iotests: Test block-stream and block-commit in parallel |
Date: |
Mon, 31 Oct 2016 18:25:49 +0100 |
From: Alberto Garcia <address@hidden>
As with test_stream_parallel(), we allow mixing block-stream and
block-commit operations in the same backing chain as long as there's
no overlap among the involved nodes.
Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/030 | 30 ++++++++++++++++++++++++++++++
tests/qemu-iotests/030.out | 4 ++--
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 3533495..83aeaa6 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -315,6 +315,36 @@ class TestParallelOps(iotests.QMPTestCase):
self.assert_qmp(result, 'return', {})
self.wait_until_completed(drive='commit-drive0')
+
+ # Test a block-stream and a block-commit job in parallel
+ def test_stream_commit(self):
+ self.assertLessEqual(8, self.num_imgs)
+ self.assert_no_active_block_jobs()
+
+ # Stream from node0 into node2
+ result = self.vm.qmp('block-stream', device='node2', job_id='node2')
+ self.assert_qmp(result, 'return', {})
+
+ # Commit from the active layer into node3
+ result = self.vm.qmp('block-commit', device='drive0',
base=self.imgs[3])
+ self.assert_qmp(result, 'return', {})
+
+ # Wait for all jobs to be finished.
+ pending_jobs = ['node2', 'drive0']
+ while len(pending_jobs) > 0:
+ for event in self.vm.get_qmp_events(wait=True):
+ if event['event'] == 'BLOCK_JOB_COMPLETED':
+ node_name = self.dictpath(event, 'data/device')
+ self.assertTrue(node_name in pending_jobs)
+ self.assert_qmp_absent(event, 'data/error')
+ pending_jobs.remove(node_name)
+ if event['event'] == 'BLOCK_JOB_READY':
+ self.assert_qmp(event, 'data/device', 'drive0')
+ self.assert_qmp(event, 'data/type', 'commit')
+ self.assert_qmp_absent(event, 'data/error')
+ self.assertTrue('drive0' in pending_jobs)
+ self.vm.qmp('block-job-complete', device='drive0')
+
self.assert_no_active_block_jobs()
class TestSmallerBackingFile(iotests.QMPTestCase):
diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out
index 4176bb9..3a89159 100644
--- a/tests/qemu-iotests/030.out
+++ b/tests/qemu-iotests/030.out
@@ -1,5 +1,5 @@
-...................
+....................
----------------------------------------------------------------------
-Ran 19 tests
+Ran 20 tests
OK
--
1.8.3.1
- [Qemu-devel] [PULL 03/29] block/ssh: Add InetSocketAddress and accept it, (continued)
- [Qemu-devel] [PULL 03/29] block/ssh: Add InetSocketAddress and accept it, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 11/29] block: Check blockers in all nodes involved in a block-commit job, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 14/29] block: Support streaming to an intermediate layer, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 13/29] block: Block all intermediate nodes in commit_active_start(), Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 15/29] block: Add QMP support for streaming to an intermediate layer, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 12/29] block: Block all nodes involved in the block-commit operation, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 16/29] docs: Document how to stream to an intermediate layer, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 17/29] qemu-iotests: Test streaming to an intermediate layer, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 18/29] qemu-iotests: Test block-stream operations in parallel, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 22/29] qemu-iotests: Test streaming to a Quorum child, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 20/29] qemu-iotests: Test block-stream and block-commit in parallel,
Kevin Wolf <=
- [Qemu-devel] [PULL 21/29] qemu-iotests: Add iotests.supports_quorum(), Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 19/29] qemu-iotests: Test overlapping stream and commit operations, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 24/29] qemu-iotests: Test the 'base-node' parameter of 'block-stream', Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 23/29] block: Add 'base-node' parameter to the 'block-stream' command, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 27/29] block: Mention replication in BlockdevDriver enum docs, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 29/29] qapi: allow blockdev-add for NFS, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 25/29] raw_bsd: add offset and size options, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 26/29] qemu-iotests: test 'offset' and 'size' options in raw driver, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 28/29] block/nfs: Introduce runtime_opts in NFS, Kevin Wolf, 2016/10/31
- Re: [Qemu-devel] [PULL 00/29] Block layer patches, Peter Maydell, 2016/10/31