Merge pull request #6585 from dzhengfy/fix_migration_xbzrle_parallel

migrate_options_shared:fix removing vm

Author: Yingshun

libvirt/tests/cfg/migration/migrate_options_shared.cfg

@@ -387,11 +387,6 @@
                                     virsh_migrate_extra = "--parallel --parallel-connections"
                                     parallel_cn_nums = 4
                                 - default_connection:
-                                - with_xbzrle_method:
-                                    only without_postcopy
-                                    virsh_migrate_extra = "--comp-methods xbzrle --parallel --parallel-connections"
-                                    parallel_cn_nums = 4
-                                    err_msg = "Compression method 'xbzrle' isn't supported with parallel migration"
                         - check_domstats:
                             asynch_migrate = "yes"
                             virsh_opt = ' -k0'
@@ -523,6 +518,10 @@
                                     parallel_cn_nums = 0
                                 - set_cross_border:
                                     parallel_cn_nums = 256
+                        - with_xbzrle_method:
+                            virsh_migrate_extra = "--comp-methods xbzrle --parallel --parallel-connections"
+                            parallel_cn_nums = 4
+                            err_msg = "Compression method 'xbzrle' isn't supported with parallel migration"
                 - cache_unsafe:
                     # Without '--unsafe', migration will fail and throw an error message
                     err_msg = "Unsafe migration: Migration may lead to data corruption"

libvirt/tests/src/migration/migrate_options_shared.py

@@ -1602,8 +1602,8 @@ def cancel_bg_migration():
                           "should not more than 1 second")
         if params.get("actions_after_migration"):
             do_actions_after_migrate(params)
-
-        if migrate_vm_back:
+        status_error = params.get("status_error", "no") == "yes"
+        if migrate_vm_back and not status_error:
             ssh_connection = utils_conn.SSHConnection(server_ip=client_ip,
                                                       server_pwd=client_pwd,
                                                       client_ip=server_ip,
@@ -1675,7 +1675,7 @@ def cancel_bg_migration():
                 remote_session.close()
 
             # Clean up of pre migration setup for local machine
-            if migrate_vm_back:
+            if migrate_vm_back and not status_error:
                 if 'ssh_connection' in locals():
                     ssh_connection.auto_recover = True
                 if 'src_full_uri' in locals():