Re: [Qemu-devel] [Qemu-block] [PATCH 4/4] iotests: add dirty bitmap migration test

[John Snow <jsnow@redhat.com>]

On 11/28/2017 02:14 AM, Vladimir Sementsov-Ogievskiy wrote:
> The test creates two vms (vm_a, vm_b), create dirty bitmap in
> the first one, do several writes to corresponding device and
> then migrate vm_a to vm_b with dirty bitmaps.
> 
> For now, only migration through shared storage for persistent
> bitmaps is available, so it is tested here. Only offline variant
> is tested for now (a kind of suspend-resume), as it is needed
> to test that this case is successfully fixed by recent patch.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
>  tests/qemu-iotests/169        | 82 +++++++++++++++++++++++++++++++++++++++++++
>  tests/qemu-iotests/169.out    |  5 +++
>  tests/qemu-iotests/group      |  1 +
>  tests/qemu-iotests/iotests.py |  7 +++-
>  4 files changed, 94 insertions(+), 1 deletion(-)
>  create mode 100755 tests/qemu-iotests/169
>  create mode 100644 tests/qemu-iotests/169.out
> 
> diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169
> new file mode 100755
> index 0000000000..a0f213b274
> --- /dev/null
> +++ b/tests/qemu-iotests/169
> @@ -0,0 +1,82 @@
> +#!/usr/bin/env python
> +#
> +# Tests for dirty bitmaps migration.
> +#
> +# Copyright (c) 2016-2017 Parallels International GmbH
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +#
> +
> +import os
> +import iotests
> +import time
> +from iotests import qemu_img
> +
> +disk = os.path.join(iotests.test_dir, 'disk')
> +migfile = os.path.join(iotests.test_dir, 'migfile')
> +
> +class TestPersistentDirtyBitmapSuspendResume(iotests.QMPTestCase):
> +
> +    def tearDown(self):
> +        self.vm_a.shutdown()
> +        self.vm_b.shutdown()
> +        os.remove(disk)
> +        os.remove(migfile)
> +
> +    def setUp(self):
> +        qemu_img('create', '-f', iotests.imgfmt, disk, '1M')
> +
> +        self.vm_a = iotests.VM(path_suffix='a').add_drive(disk)
> +        self.vm_a.launch()
> +
> +        self.vm_b = iotests.VM(path_suffix='b').add_drive(disk)
> +        self.vm_b.add_incoming("exec: cat '" + migfile + "'")
> +
> +    def test_migration_persistent_shared_offline(self):
> +        """ A kind of suspend-resume """
> +        granularity = 512
> +        regions = [
> +            { 'start': 0,           'count': 0x10000 },
> +            { 'start': 0xf0000,     'count': 0x10000 },
> +            { 'start': 0xa0201,     'count': 0x1000  }
> +            ]
> +
> +        result = self.vm_a.qmp('block-dirty-bitmap-add', node='drive0',
> +                               name='bitmap0', granularity=granularity,
> +                               persistent=True, autoload=True)
> +        self.assert_qmp(result, 'return', {});
> +
> +        for r in regions:
> +            self.vm_a.hmp_qemu_io('drive0',
> +                                  'write %d %d' % (r['start'], r['count']))
> +
> +        result = self.vm_a.qmp('x-debug-block-dirty-bitmap-sha256',
> +                               node='drive0', name='bitmap0')
> +        sha256 = result['return']['sha256']
> +
> +        result = self.vm_a.qmp('migrate', uri='exec:cat>' + migfile)
> +        self.assert_qmp(result, 'return', {});
> +        self.assertNotEqual(self.vm_a.event_wait("STOP"), None)
> +        self.vm_a.shutdown()
> +
> +        self.vm_b.launch()
> +        self.vm_b.event_wait("RESUME", timeout=10)
> +
> +        result = self.vm_b.qmp('x-debug-block-dirty-bitmap-sha256',
> +                               node='drive0', name='bitmap0')
> +        self.assert_qmp(result, 'return/sha256', sha256);
> +
> +
> +if __name__ == '__main__':
> +    iotests.main(supported_fmts=['qcow2'])
> diff --git a/tests/qemu-iotests/169.out b/tests/qemu-iotests/169.out
> new file mode 100644
> index 0000000000..ae1213e6f8
> --- /dev/null
> +++ b/tests/qemu-iotests/169.out
> @@ -0,0 +1,5 @@
> +.
> +----------------------------------------------------------------------
> +Ran 1 tests
> +
> +OK
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index 3e688678dd..e879c7ebc7 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -169,6 +169,7 @@
>  162 auto quick
>  163 rw auto quick
>  165 rw auto quick
> +169 rw auto quick
>  170 rw auto quick
>  171 rw auto quick
>  172 auto

Looks good without the extraneous bits, thank you.

We're obviously late for 2.11, so I recommend CC qemu-stable after
review and we'll include it in 2.11.1.

Reviewed-by: John Snow <jsnow@redhat.com>

> diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
> index 6f057904a9..ce029b51e2 100644
> --- a/tests/qemu-iotests/iotests.py
> +++ b/tests/qemu-iotests/iotests.py
> @@ -430,6 +430,10 @@ def verify_platform(supported_oses=['linux']):
>      if True not in [sys.platform.startswith(x) for x in supported_oses]:
>          notrun('not suitable for this OS: %s' % sys.platform)
>  
> +def verify_cache_mode(supported_cache_modes=[]):
> +    if supported_cache_modes and (cachemode not in supported_cache_modes):
> +        notrun('not suitable for this cache mode: %s' % cachemode)
> +
>  def supports_quorum():
>      return 'quorum' in qemu_img_pipe('--help')
>  
> @@ -438,7 +442,7 @@ def verify_quorum():
>      if not supports_quorum():
>          notrun('quorum support missing')
>  
> -def main(supported_fmts=[], supported_oses=['linux']):
> +def main(supported_fmts=[], supported_oses=['linux'], supported_cache_modes=[]):
>      '''Run tests'''
>  
>      global debug
> @@ -455,6 +459,7 @@ def main(supported_fmts=[], supported_oses=['linux']):
>      verbosity = 1
>      verify_image_format(supported_fmts)
>      verify_platform(supported_oses)
> +    verify_cache_mode(supported_cache_modes)
>  
>      # We need to filter out the time taken from the output so that qemu-iotest
>      # can reliably diff the results against master output.
>