Re: [Qemu-block] [PATCH 18/18] iotests: Add test for active mirroring

2017-09-19 Thread Fam Zheng
On Mon, 09/18 18:53, Max Reitz wrote:
> >> +
> >> +if sync_source_and_target:
> >> +# If source and target should be in sync after the mirror,
> >> +# we have to flush before completion
> > 
> > Not sure I understand this requirements, does it apply to libvirt and user 
> > too?
> > I.e. it's a part of the interface ? Why cannot mirror_complete do it
> > automatically?
> 
> Well, it seems to pass without this flush, but the original intention
> was this: When mirror is completed, the source node is replaced by the
> target.  All further writes are then only executed on the (former)
> target node.  So what might happen (or at least I think it could) is
> that qemu-io submits some writes, but before they are actually
> performed, the mirror block job is completed and the source is replaced
> by the target.  Then, the write operations are performed on the target
> but no longer on the source, so source and target are then out of sync.
> For the mirror block job, that is fine -- at the point of completion,
> source and target were in sync.  The job doesn't care that they get out
> of sync after completion.  But here, we have to care or we can't compare
> source and target.
> 
> The reason for why it always seems to pass without a flush is that every
> submitted write is actually sent to the mirror node before it yields for
> the first time.  But I wouldn't bet on that, so I think it's better to
> keep the flush before completing the block job.

OK, that makes sense. Thanks.

Fam



Re: [Qemu-block] [PATCH 18/18] iotests: Add test for active mirroring

2017-09-18 Thread Max Reitz
On 2017-09-18 08:45, Fam Zheng wrote:
> On Wed, 09/13 20:19, Max Reitz wrote:
>> Signed-off-by: Max Reitz 
>> ---
>>  tests/qemu-iotests/151 | 111 
>> +
>>  tests/qemu-iotests/151.out |   5 ++
>>  tests/qemu-iotests/group   |   1 +
>>  3 files changed, 117 insertions(+)
>>  create mode 100755 tests/qemu-iotests/151
>>  create mode 100644 tests/qemu-iotests/151.out
>>
>> diff --git a/tests/qemu-iotests/151 b/tests/qemu-iotests/151
>> new file mode 100755
>> index 00..49a60773f9
>> --- /dev/null
>> +++ b/tests/qemu-iotests/151
>> @@ -0,0 +1,111 @@
>> +#!/usr/bin/env python
>> +#
>> +# Tests for active mirroring
>> +#
>> +# Copyright (C) 2017 Red Hat, Inc.
>> +#
>> +# This program is free software; you can redistribute it and/or modify
>> +# it under the terms of the GNU General Public License as published by
>> +# the Free Software Foundation; either version 2 of the License, or
>> +# (at your option) any later version.
>> +#
>> +# This program is distributed in the hope that it will be useful,
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> +# GNU General Public License for more details.
>> +#
>> +# You should have received a copy of the GNU General Public License
>> +# along with this program.  If not, see .
>> +#
>> +
>> +import os
>> +import iotests
>> +from iotests import qemu_img
>> +
>> +source_img = os.path.join(iotests.test_dir, 'source.' + iotests.imgfmt)
>> +target_img = os.path.join(iotests.test_dir, 'target.' + iotests.imgfmt)
>> +
>> +class TestActiveMirror(iotests.QMPTestCase):
>> +image_len = 128 * 1024 * 1024 # MB
>> +potential_writes_in_flight = True
>> +
>> +def setUp(self):
>> +qemu_img('create', '-f', iotests.imgfmt, source_img, '128M')
>> +qemu_img('create', '-f', iotests.imgfmt, target_img, '128M')
>> +
>> +blk_source = {'node-name': 'source',
>> +  'driver': iotests.imgfmt,
>> +  'file': {'driver': 'file',
>> +   'filename': source_img}}
>> +
>> +blk_target = {'node-name': 'target',
>> +  'driver': iotests.imgfmt,
>> +  'file': {'driver': 'file',
>> +   'filename': target_img}}
>> +
>> +self.vm = iotests.VM()
>> +self.vm.add_blockdev(self.qmp_to_opts(blk_source))
>> +self.vm.add_blockdev(self.qmp_to_opts(blk_target))
>> +self.vm.launch()
>> +
>> +def tearDown(self):
>> +self.vm.shutdown()
>> +
>> +if not self.potential_writes_in_flight:
>> +self.assertTrue(iotests.compare_images(source_img, target_img),
>> +'mirror target does not match source')
>> +
>> +os.remove(source_img)
>> +os.remove(target_img)
>> +
>> +def doActiveIO(self, sync_source_and_target):
>> +# Fill the source image
>> +self.vm.hmp_qemu_io('source',
>> +'write -P 1 0 %i' % self.image_len);
>> +
>> +# Start some background requests
>> +for offset in range(0, self.image_len, 1024 * 1024):
>> +self.vm.hmp_qemu_io('source', 'write -B -P 2 %i 1M' % offset)
>> +
>> +# Start the block job
>> +result = self.vm.qmp('blockdev-mirror',
>> + job_id='mirror',
>> + filter_node_name='mirror-node',
>> + device='source',
>> + target='target',
>> + sync='full',
>> + copy_mode='active-write')
>> +self.assert_qmp(result, 'return', {})
>> +
>> +# Start some more requests
>> +for offset in range(0, self.image_len, 1024 * 1024):
>> +self.vm.hmp_qemu_io('mirror-node', 'write -B -P 3 %i 1M' % 
>> offset)
>> +
>> +# Wait for the READY event
>> +self.wait_ready(drive='mirror')
>> +
>> +# Now start some final requests; all of these (which land on
>> +# the source) should be settled using the active mechanism.
>> +# The mirror code itself asserts that the source BDS's dirty
>> +# bitmap will stay clean between READY and COMPLETED.
>> +for offset in range(0, self.image_len, 1024 * 1024):
>> +self.vm.hmp_qemu_io('mirror-node', 'write -B -P 4 %i 1M' % 
>> offset)
>> +
>> +if sync_source_and_target:
>> +# If source and target should be in sync after the mirror,
>> +# we have to flush before completion
> 
> Not sure I understand this requirements, does it apply to libvirt and user 
> too?
> I.e. it's a part of the interface ? Why cannot mirror_complete do it
> automatically?

Well, it seems to pass without this flush, but the original intention
was this: When mirror is completed, the source node is replace

Re: [Qemu-block] [PATCH 18/18] iotests: Add test for active mirroring

2017-09-17 Thread Fam Zheng
On Wed, 09/13 20:19, Max Reitz wrote:
> Signed-off-by: Max Reitz 
> ---
>  tests/qemu-iotests/151 | 111 
> +
>  tests/qemu-iotests/151.out |   5 ++
>  tests/qemu-iotests/group   |   1 +
>  3 files changed, 117 insertions(+)
>  create mode 100755 tests/qemu-iotests/151
>  create mode 100644 tests/qemu-iotests/151.out
> 
> diff --git a/tests/qemu-iotests/151 b/tests/qemu-iotests/151
> new file mode 100755
> index 00..49a60773f9
> --- /dev/null
> +++ b/tests/qemu-iotests/151
> @@ -0,0 +1,111 @@
> +#!/usr/bin/env python
> +#
> +# Tests for active mirroring
> +#
> +# Copyright (C) 2017 Red Hat, Inc.
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see .
> +#
> +
> +import os
> +import iotests
> +from iotests import qemu_img
> +
> +source_img = os.path.join(iotests.test_dir, 'source.' + iotests.imgfmt)
> +target_img = os.path.join(iotests.test_dir, 'target.' + iotests.imgfmt)
> +
> +class TestActiveMirror(iotests.QMPTestCase):
> +image_len = 128 * 1024 * 1024 # MB
> +potential_writes_in_flight = True
> +
> +def setUp(self):
> +qemu_img('create', '-f', iotests.imgfmt, source_img, '128M')
> +qemu_img('create', '-f', iotests.imgfmt, target_img, '128M')
> +
> +blk_source = {'node-name': 'source',
> +  'driver': iotests.imgfmt,
> +  'file': {'driver': 'file',
> +   'filename': source_img}}
> +
> +blk_target = {'node-name': 'target',
> +  'driver': iotests.imgfmt,
> +  'file': {'driver': 'file',
> +   'filename': target_img}}
> +
> +self.vm = iotests.VM()
> +self.vm.add_blockdev(self.qmp_to_opts(blk_source))
> +self.vm.add_blockdev(self.qmp_to_opts(blk_target))
> +self.vm.launch()
> +
> +def tearDown(self):
> +self.vm.shutdown()
> +
> +if not self.potential_writes_in_flight:
> +self.assertTrue(iotests.compare_images(source_img, target_img),
> +'mirror target does not match source')
> +
> +os.remove(source_img)
> +os.remove(target_img)
> +
> +def doActiveIO(self, sync_source_and_target):
> +# Fill the source image
> +self.vm.hmp_qemu_io('source',
> +'write -P 1 0 %i' % self.image_len);
> +
> +# Start some background requests
> +for offset in range(0, self.image_len, 1024 * 1024):
> +self.vm.hmp_qemu_io('source', 'write -B -P 2 %i 1M' % offset)
> +
> +# Start the block job
> +result = self.vm.qmp('blockdev-mirror',
> + job_id='mirror',
> + filter_node_name='mirror-node',
> + device='source',
> + target='target',
> + sync='full',
> + copy_mode='active-write')
> +self.assert_qmp(result, 'return', {})
> +
> +# Start some more requests
> +for offset in range(0, self.image_len, 1024 * 1024):
> +self.vm.hmp_qemu_io('mirror-node', 'write -B -P 3 %i 1M' % 
> offset)
> +
> +# Wait for the READY event
> +self.wait_ready(drive='mirror')
> +
> +# Now start some final requests; all of these (which land on
> +# the source) should be settled using the active mechanism.
> +# The mirror code itself asserts that the source BDS's dirty
> +# bitmap will stay clean between READY and COMPLETED.
> +for offset in range(0, self.image_len, 1024 * 1024):
> +self.vm.hmp_qemu_io('mirror-node', 'write -B -P 4 %i 1M' % 
> offset)
> +
> +if sync_source_and_target:
> +# If source and target should be in sync after the mirror,
> +# we have to flush before completion

Not sure I understand this requirements, does it apply to libvirt and user too?
I.e. it's a part of the interface ? Why cannot mirror_complete do it
automatically?

Fam

> +self.vm.hmp_qemu_io('mirror-node', 'flush')
> +self.potential_writes_in_flight = False
> +
> +self.complete_and_wait(drive='mirror', wait_ready=False)
> +
> +def testActiveIO(self):
> +self.doActiveIO(False)
> +
> +def testActiveIOFlushed(s

[Qemu-block] [PATCH 18/18] iotests: Add test for active mirroring

2017-09-13 Thread Max Reitz
Signed-off-by: Max Reitz 
---
 tests/qemu-iotests/151 | 111 +
 tests/qemu-iotests/151.out |   5 ++
 tests/qemu-iotests/group   |   1 +
 3 files changed, 117 insertions(+)
 create mode 100755 tests/qemu-iotests/151
 create mode 100644 tests/qemu-iotests/151.out

diff --git a/tests/qemu-iotests/151 b/tests/qemu-iotests/151
new file mode 100755
index 00..49a60773f9
--- /dev/null
+++ b/tests/qemu-iotests/151
@@ -0,0 +1,111 @@
+#!/usr/bin/env python
+#
+# Tests for active mirroring
+#
+# Copyright (C) 2017 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+#
+
+import os
+import iotests
+from iotests import qemu_img
+
+source_img = os.path.join(iotests.test_dir, 'source.' + iotests.imgfmt)
+target_img = os.path.join(iotests.test_dir, 'target.' + iotests.imgfmt)
+
+class TestActiveMirror(iotests.QMPTestCase):
+image_len = 128 * 1024 * 1024 # MB
+potential_writes_in_flight = True
+
+def setUp(self):
+qemu_img('create', '-f', iotests.imgfmt, source_img, '128M')
+qemu_img('create', '-f', iotests.imgfmt, target_img, '128M')
+
+blk_source = {'node-name': 'source',
+  'driver': iotests.imgfmt,
+  'file': {'driver': 'file',
+   'filename': source_img}}
+
+blk_target = {'node-name': 'target',
+  'driver': iotests.imgfmt,
+  'file': {'driver': 'file',
+   'filename': target_img}}
+
+self.vm = iotests.VM()
+self.vm.add_blockdev(self.qmp_to_opts(blk_source))
+self.vm.add_blockdev(self.qmp_to_opts(blk_target))
+self.vm.launch()
+
+def tearDown(self):
+self.vm.shutdown()
+
+if not self.potential_writes_in_flight:
+self.assertTrue(iotests.compare_images(source_img, target_img),
+'mirror target does not match source')
+
+os.remove(source_img)
+os.remove(target_img)
+
+def doActiveIO(self, sync_source_and_target):
+# Fill the source image
+self.vm.hmp_qemu_io('source',
+'write -P 1 0 %i' % self.image_len);
+
+# Start some background requests
+for offset in range(0, self.image_len, 1024 * 1024):
+self.vm.hmp_qemu_io('source', 'write -B -P 2 %i 1M' % offset)
+
+# Start the block job
+result = self.vm.qmp('blockdev-mirror',
+ job_id='mirror',
+ filter_node_name='mirror-node',
+ device='source',
+ target='target',
+ sync='full',
+ copy_mode='active-write')
+self.assert_qmp(result, 'return', {})
+
+# Start some more requests
+for offset in range(0, self.image_len, 1024 * 1024):
+self.vm.hmp_qemu_io('mirror-node', 'write -B -P 3 %i 1M' % offset)
+
+# Wait for the READY event
+self.wait_ready(drive='mirror')
+
+# Now start some final requests; all of these (which land on
+# the source) should be settled using the active mechanism.
+# The mirror code itself asserts that the source BDS's dirty
+# bitmap will stay clean between READY and COMPLETED.
+for offset in range(0, self.image_len, 1024 * 1024):
+self.vm.hmp_qemu_io('mirror-node', 'write -B -P 4 %i 1M' % offset)
+
+if sync_source_and_target:
+# If source and target should be in sync after the mirror,
+# we have to flush before completion
+self.vm.hmp_qemu_io('mirror-node', 'flush')
+self.potential_writes_in_flight = False
+
+self.complete_and_wait(drive='mirror', wait_ready=False)
+
+def testActiveIO(self):
+self.doActiveIO(False)
+
+def testActiveIOFlushed(self):
+self.doActiveIO(True)
+
+
+
+if __name__ == '__main__':
+iotests.main(supported_fmts=['qcow2', 'raw'])
diff --git a/tests/qemu-iotests/151.out b/tests/qemu-iotests/151.out
new file mode 100644
index 00..fbc63e62f8
--- /dev/null
+++ b/tests/qemu-iotests/151.out
@@ -0,0 +1,5 @@
+..
+--
+Ran 2 tests
+
+OK
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/