new file mode 100755
@@ -0,0 +1,487 @@
+#!/usr/bin/env python3
+#
+# Tests for dirty bitmaps migration with node aliases
+#
+# 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 random
+from typing import Dict, List, Union
+import iotests
+
+assert iotests.sock_dir is not None
+mig_sock = os.path.join(iotests.sock_dir, 'mig_sock')
+
+class TestDirtyBitmapMigration(iotests.QMPTestCase):
+ src_node_name: str = ''
+ dst_node_name: str = ''
+ src_bmap_name: str = ''
+ dst_bmap_name: str = ''
+
+ def setUp(self) -> None:
+ self.vm_a = iotests.VM(path_suffix='-a')
+ self.vm_a.add_blockdev(f'node-name={self.src_node_name},' \
+ 'driver=null-co')
+ self.vm_a.launch()
+
+ self.vm_b = iotests.VM(path_suffix='-b')
+ self.vm_b.add_blockdev(f'node-name={self.dst_node_name},' \
+ 'driver=null-co')
+ self.vm_b.add_incoming(f'unix:{mig_sock}')
+ self.vm_b.launch()
+
+ result = self.vm_a.qmp('block-dirty-bitmap-add',
+ node=self.src_node_name,
+ name=self.src_bmap_name)
+ self.assert_qmp(result, 'return', {})
+
+ # Dirty some random megabytes
+ for _ in range(9):
+ mb_ofs = random.randrange(1024)
+ self.vm_a.hmp_qemu_io(self.src_node_name, 'write %dM 1M' % mb_ofs)
+
+ result = self.vm_a.qmp('x-debug-block-dirty-bitmap-sha256',
+ node=self.src_node_name,
+ name=self.src_bmap_name)
+ self.bitmap_hash_reference = result['return']['sha256']
+
+ caps = [{'capability': name, 'state': True} \
+ for name in ('dirty-bitmaps', 'events')]
+
+ for vm in (self.vm_a, self.vm_b):
+ result = vm.qmp('migrate-set-capabilities', capabilities=caps)
+ self.assert_qmp(result, 'return', {})
+
+ def tearDown(self) -> None:
+ self.vm_a.shutdown()
+ self.vm_b.shutdown()
+ try:
+ os.remove(mig_sock)
+ except OSError:
+ pass
+
+ def check_bitmap(self, bitmap_name_valid: bool) -> None:
+ result = self.vm_b.qmp('x-debug-block-dirty-bitmap-sha256',
+ node=self.dst_node_name,
+ name=self.dst_bmap_name)
+ if bitmap_name_valid:
+ self.assert_qmp(result, 'return/sha256',
+ self.bitmap_hash_reference)
+ else:
+ self.assert_qmp(result, 'error/desc',
+ f"Dirty bitmap '{self.dst_bmap_name}' not found")
+
+ def migrate(self, migration_success: bool = True,
+ bitmap_name_valid: bool = True) -> None:
+ result = self.vm_a.qmp('migrate', uri=f'unix:{mig_sock}')
+ self.assert_qmp(result, 'return', {})
+
+ status = None
+ while status not in ('completed', 'failed'):
+ status = self.vm_a.event_wait('MIGRATION')['data']['status']
+
+ self.assertEqual(status == 'completed', migration_success)
+ if status == 'failed':
+ # Wait until the migration has been cleaned up
+ # (Otherwise, bdrv_close_all() will abort because the
+ # dirty bitmap migration code still holds a reference to
+ # the BDS)
+ # (Unfortunately, there does not appear to be a nicer way
+ # of waiting until a failed migration has been cleaned up)
+ timeout_msg = 'Timeout waiting for migration to be cleaned up'
+ with iotests.Timeout(30, timeout_msg):
+ while os.path.exists(mig_sock):
+ pass
+
+ # Dropping src_node_name will only work once the
+ # bitmap migration code has released it
+ while 'error' in self.vm_a.qmp('blockdev-del',
+ node_name=self.src_node_name):
+ pass
+
+ return
+
+ self.vm_a.wait_for_runstate('postmigrate')
+ self.vm_b.wait_for_runstate('running')
+
+ self.check_bitmap(bitmap_name_valid)
+
+ @staticmethod
+ def mapping(node_name: str, node_alias: str,
+ bitmap_name: str, bitmap_alias: str) \
+ -> List[Dict[str, Union[str, List[Dict[str, str]]]]]:
+ return [{
+ 'node-name': node_name,
+ 'alias': node_alias,
+ 'bitmaps': [{
+ 'name': bitmap_name,
+ 'alias': bitmap_alias
+ }]
+ }]
+
+
+class TestAliasMigration(TestDirtyBitmapMigration):
+ src_node_name = 'node0'
+ dst_node_name = 'node0'
+ src_bmap_name = 'bmap0'
+ dst_bmap_name = 'bmap0'
+
+ def test_migration_without_alias(self) -> None:
+ self.migrate(self.src_node_name == self.dst_node_name,
+ self.src_bmap_name == self.dst_bmap_name)
+
+ def test_alias_on_src_migration(self) -> None:
+ mapping = self.mapping(self.src_node_name, self.dst_node_name,
+ self.src_bmap_name, self.dst_bmap_name)
+
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'return', {})
+
+ self.migrate()
+
+ def test_alias_on_dst_migration(self) -> None:
+ mapping = self.mapping(self.dst_node_name, self.src_node_name,
+ self.dst_bmap_name, self.src_bmap_name)
+
+ result = self.vm_b.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'return', {})
+
+ self.migrate()
+
+ def test_alias_on_both_migration(self) -> None:
+ src_map = self.mapping(self.src_node_name, 'node-alias',
+ self.src_bmap_name, 'bmap-alias')
+
+ dst_map = self.mapping(self.dst_node_name, 'node-alias',
+ self.dst_bmap_name, 'bmap-alias')
+
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=src_map)
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm_b.qmp('migrate-set-parameters',
+ block_bitmap_mapping=dst_map)
+ self.assert_qmp(result, 'return', {})
+
+ self.migrate()
+
+
+class TestNodeAliasMigration(TestAliasMigration):
+ src_node_name = 'node-src'
+ dst_node_name = 'node-dst'
+
+
+class TestBitmapAliasMigration(TestAliasMigration):
+ src_bmap_name = 'bmap-src'
+ dst_bmap_name = 'bmap-dst'
+
+
+class TestFullAliasMigration(TestAliasMigration):
+ src_node_name = 'node-src'
+ dst_node_name = 'node-dst'
+ src_bmap_name = 'bmap-src'
+ dst_bmap_name = 'bmap-dst'
+
+
+class TestBlockBitmapMappingErrors(TestDirtyBitmapMigration):
+ src_node_name = 'node0'
+ dst_node_name = 'node0'
+ src_bmap_name = 'bmap0'
+ dst_bmap_name = 'bmap0'
+
+ """
+ Note that mapping nodes or bitmaps that do not exist is not an error.
+ """
+
+ def test_non_injective_node_mapping(self) -> None:
+ mapping = [
+ {
+ 'node-name': 'node0',
+ 'alias': 'common-alias',
+ 'bitmaps': [{
+ 'name': 'bmap0',
+ 'alias': 'bmap-alias0'
+ }]
+ },
+ {
+ 'node-name': 'node1',
+ 'alias': 'common-alias',
+ 'bitmaps': [{
+ 'name': 'bmap1',
+ 'alias': 'bmap-alias1'
+ }]
+ }
+ ]
+
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'error/desc',
+ 'Invalid mapping given for block-bitmap-mapping: ' \
+ 'The node alias common-alias is used twice')
+
+ def test_non_injective_bitmap_mapping(self) -> None:
+ mapping = [{
+ 'node-name': 'node0',
+ 'alias': 'node-alias0',
+ 'bitmaps': [
+ {
+ 'name': 'bmap0',
+ 'alias': 'common-alias'
+ },
+ {
+ 'name': 'bmap1',
+ 'alias': 'common-alias'
+ }
+ ]
+ }]
+
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'error/desc',
+ 'Invalid mapping given for block-bitmap-mapping: ' \
+ 'The bitmap alias node-alias0/common-alias is used ' \
+ 'twice')
+
+ def test_ambiguous_node_mapping(self) -> None:
+ mapping = [
+ {
+ 'node-name': 'node0',
+ 'alias': 'node-alias0',
+ 'bitmaps': [{
+ 'name': 'bmap0',
+ 'alias': 'bmap-alias0'
+ }]
+ },
+ {
+ 'node-name': 'node0',
+ 'alias': 'node-alias1',
+ 'bitmaps': [{
+ 'name': 'bmap0',
+ 'alias': 'bmap-alias0'
+ }]
+ }
+ ]
+
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'error/desc',
+ 'Invalid mapping given for block-bitmap-mapping: ' \
+ 'The node name node0 is mapped twice')
+
+ def test_ambiguous_bitmap_mapping(self) -> None:
+ mapping = [{
+ 'node-name': 'node0',
+ 'alias': 'node-alias0',
+ 'bitmaps': [
+ {
+ 'name': 'bmap0',
+ 'alias': 'bmap-alias0'
+ },
+ {
+ 'name': 'bmap0',
+ 'alias': 'bmap-alias1'
+ }
+ ]
+ }]
+
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'error/desc',
+ 'Invalid mapping given for block-bitmap-mapping: ' \
+ 'The bitmap node0/bmap0 is mapped twice')
+
+ def test_migratee_node_is_not_mapped_on_src(self) -> None:
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=[])
+ self.assert_qmp(result, 'return', {})
+
+ self.migrate(False, False)
+
+ self.vm_a.shutdown()
+ self.assertIn(f"Bitmap '{self.src_bmap_name}' on node " \
+ f"'{self.src_node_name}' with no alias cannot be " \
+ "migrated",
+ self.vm_a.get_log())
+
+ def test_migratee_node_is_not_mapped_on_dst(self) -> None:
+ result = self.vm_b.qmp('migrate-set-parameters',
+ block_bitmap_mapping=[])
+ self.assert_qmp(result, 'return', {})
+
+ self.migrate(False, False)
+
+ self.vm_b.shutdown()
+ self.assertIn(f"Unknown node alias '{self.src_node_name}'",
+ self.vm_b.get_log())
+
+ def test_migratee_bitmap_is_not_mapped_on_src(self) -> None:
+ mapping = [{
+ 'node-name': self.src_node_name,
+ 'alias': self.dst_node_name,
+ 'bitmaps': []
+ }]
+
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'return', {})
+
+ self.migrate(False, False)
+
+ self.vm_a.shutdown()
+ self.assertIn(f"Bitmap '{self.src_bmap_name}' with no alias on node " \
+ f"'{self.src_node_name}' cannot be migrated",
+ self.vm_a.get_log())
+
+ def test_migratee_bitmap_is_not_mapped_on_dst(self) -> None:
+ mapping = [{
+ 'node-name': self.dst_node_name,
+ 'alias': self.src_node_name,
+ 'bitmaps': []
+ }]
+
+ result = self.vm_b.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'return', {})
+
+ self.migrate(False, False)
+
+ self.vm_b.shutdown()
+ self.assertIn(f"Unknown bitmap alias '{self.src_bmap_name}' on node " \
+ f"'{self.dst_node_name}' (alias '{self.src_node_name}')",
+ self.vm_b.get_log())
+
+ def test_non_wellformed_node_alias(self) -> None:
+ mapping = [{
+ 'node-name': self.src_bmap_name,
+ 'alias': '123-foo',
+ 'bitmaps': []
+ }]
+
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=mapping)
+ self.assert_qmp(result, 'error/desc',
+ 'Invalid mapping given for block-bitmap-mapping: ' \
+ 'The node alias 123-foo is not well-formed')
+
+
+class TestCrossAliasMigration(TestDirtyBitmapMigration):
+ """
+ Swap aliases, both to see that qemu does not get confused, and
+ that we can migrate multiple things at once.
+
+ So we migrate this:
+ node-a.bmap-a -> node-b.bmap-b
+ node-a.bmap-b -> node-b.bmap-a
+ node-b.bmap-a -> node-a.bmap-b
+ node-b.bmap-b -> node-a.bmap-a
+ """
+
+ src_node_name = 'node-a'
+ dst_node_name = 'node-b'
+ src_bmap_name = 'bmap-a'
+ dst_bmap_name = 'bmap-b'
+
+ def setUp(self) -> None:
+ TestDirtyBitmapMigration.setUp(self)
+
+ # Now create another block device and let both have two bitmaps each
+ result = self.vm_a.qmp('blockdev-add',
+ node_name='node-b', driver='null-co')
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm_b.qmp('blockdev-add',
+ node_name='node-a', driver='null-co')
+ self.assert_qmp(result, 'return', {})
+
+ bmaps_to_add = (('node-a', 'bmap-b'),
+ ('node-b', 'bmap-a'),
+ ('node-b', 'bmap-b'))
+
+ for (node, bmap) in bmaps_to_add:
+ result = self.vm_a.qmp('block-dirty-bitmap-add',
+ node=node, name=bmap)
+ self.assert_qmp(result, 'return', {})
+
+ @staticmethod
+ def cross_mapping() -> List[Dict[str, Union[str, List[Dict[str, str]]]]]:
+ return [
+ {
+ 'node-name': 'node-a',
+ 'alias': 'node-b',
+ 'bitmaps': [
+ {
+ 'name': 'bmap-a',
+ 'alias': 'bmap-b'
+ },
+ {
+ 'name': 'bmap-b',
+ 'alias': 'bmap-a'
+ }
+ ]
+ },
+ {
+ 'node-name': 'node-b',
+ 'alias': 'node-a',
+ 'bitmaps': [
+ {
+ 'name': 'bmap-b',
+ 'alias': 'bmap-a'
+ },
+ {
+ 'name': 'bmap-a',
+ 'alias': 'bmap-b'
+ }
+ ]
+ }
+ ]
+
+ def verify_dest_has_all_bitmaps(self) -> None:
+ bitmaps = self.vm_a.query_bitmaps()
+
+ # Extract and sort bitmap names
+ for node in bitmaps:
+ bitmaps[node] = sorted((bmap['name'] for bmap in bitmaps[node]))
+
+ self.assertEqual(bitmaps,
+ {'node-a': ['bmap-a', 'bmap-b'],
+ 'node-b': ['bmap-a', 'bmap-b']})
+
+ def test_alias_on_src(self) -> None:
+ result = self.vm_a.qmp('migrate-set-parameters',
+ block_bitmap_mapping=self.cross_mapping())
+ self.assert_qmp(result, 'return', {})
+
+ # Checks that node-a.bmap-a was migrated to node-b.bmap-b, and
+ # that is enough
+ self.migrate()
+
+ self.verify_dest_has_all_bitmaps()
+
+ def test_alias_on_dst(self) -> None:
+ result = self.vm_b.qmp('migrate-set-parameters',
+ block_bitmap_mapping=self.cross_mapping())
+ self.assert_qmp(result, 'return', {})
+
+ # Checks that node-a.bmap-a was migrated to node-b.bmap-b, and
+ # that is enough
+ self.migrate()
+
+ self.verify_dest_has_all_bitmaps()
+
+
+if __name__ == '__main__':
+ iotests.main(supported_protocols=['file'])
new file mode 100644
@@ -0,0 +1,5 @@
+...........................
+----------------------------------------------------------------------
+Ran 27 tests
+
+OK
@@ -302,3 +302,4 @@
291 rw quick
292 rw auto quick
297 meta
+300 migration
Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/300 | 487 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/300.out | 5 + tests/qemu-iotests/group | 1 + 3 files changed, 493 insertions(+) create mode 100755 tests/qemu-iotests/300 create mode 100644 tests/qemu-iotests/300.out