Merge pull request #6599 from meinaLi/iothreadset

Virtual disk/cpu: add new case for iothreadset

Author: cliping

libvirt/tests/cfg/cpu/iothread.cfg

@@ -64,6 +64,24 @@
                     iothread_config = {'iothread': [{'id': '2', 'thread_pool_min': '1', 'thread_pool_max': '1', 'poll': {'max': '1', 'grow': '1', 'shrink': '1'}}]}
                     test_operations = "iothreadset"
                     check_iotheadids_inactive = "yes"
+                - iothread_live_set:
+                    func_supported_since_libvirt_ver = (9, 4, 0)
+                    pre_vm_stats = "running"
+                    live_set = "yes"
+                    iothread_num = "2"
+                    iothread_ids = "1 2"
+                    iothreadset_id = "1"
+                    test_operations = "iothreadset"
+                    iothread_config = {'iothread': [{'id': '2', 'thread_pool_min': '1', 'thread_pool_max': '1', 'poll': {'max': '1', 'grow': '1', 'shrink': '1'}}]}
+                    variants:
+                        - with_max_value:
+                            thread_pool_max = 2147483647
+                            thread_pool_min = 2147483647
+                            iothreadset_val = "--thread-pool-min ${thread_pool_min} --thread-pool-max ${thread_pool_max} --poll-max-ns 2147483647 --poll-grow 2147483647 --poll-shrink 2147483647"
+                        - with_min_value:
+                            thread_pool_max = 1
+                            thread_pool_min = 1
+                            iothreadset_val = "--thread-pool-min ${thread_pool_min} --thread-pool-max ${thread_pool_max} --poll-max-ns 1 --poll-grow 1 --poll-shrink 1"
                 - disk_attach:
                     pre_vm_stats = "running"
                     create_disk = "yes"

libvirt/tests/src/cpu/iothread.py

@@ -275,6 +275,7 @@ def _reassemble_iothread_config(mapping):
                 iothread1.update({re.sub('-', '_', item.split()[0]): item.split()[1]})
             iothread1.update({'poll': tmp_poll})
         iothread_config['iothread'].append(iothread1)
+
         logging.debug("Configured iothreads:%s", iothread_config['iothread'])
         return iothread_config
 
@@ -396,6 +397,8 @@ def exec_iothreadset(need_verify=True):
             verify_poll()
         if test_thread_pool and need_verify:
             verify_thread_pool()
+        if live_set:
+            verify_iothread_by_vm_xml()
 
     def exec_attach_disk(vm_name, source, target, thread_id,
                          ignore_status=False):
@@ -464,18 +467,24 @@ def check_iothread_pool(org_pool, act_pool, is_equal=False):
 
         :param org_pool: original pool
         :param act_pool: actual pool
-        :param is_equal: True to assume they are some values
-                         False to check if they are different
+        :param is_equal: True to check if org_pool is a subset of act_pool
+                         False to check if they are not exactly equal
         :raise: test.fail if result does not show as expected
         """
-        if (org_pool == act_pool) != is_equal:
-            err_info = ("The iothread pool values haven't been updated!"
-                        "Expected: {}, Actual: {}".format(org_pool, act_pool))
-            if is_equal:
+        if is_equal:
+            for key, expected_value in org_pool.items():
+                if key not in act_pool or act_pool[key] != expected_value:
+                    err_info = ("The iothread pool values were not updated as expected. "
+                                "Mismatch found for key '%s'.\n"
+                                "Expected subset: %s\n"
+                                "Actual full set: %s" % (key, org_pool, act_pool))
+                    test.fail(err_info)
+        else:
+            if org_pool == act_pool:
                 err_info = ("The iothread pool values have been updated "
                             "unexpectedly! Expected: {}, Actual: {}"
                             .format(org_pool, act_pool))
-            test.fail(err_info)
+                test.fail(err_info)
 
     def check_schedinfo():
         """
@@ -545,6 +554,7 @@ def _exec_schedinfo(items, update_error=False):
     restart_libvirtd = "yes" == params.get("restart_libvirtd", "no")
     restart_vm = "yes" == params.get("restart_vm", "no")
     need_start_vm = "yes" == params.get("need_start_vm", "no")
+    live_set = "yes" == params.get("live_set", "no")
     test_operations = params.get("test_operations")
     cmd_options = params.get("cmd_options", '')