Skip to content

migrate_options_shared:fix removing vm #6585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

migrate_options_shared:fix removing vm #6585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions libvirt/tests/cfg/migration/migrate_options_shared.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions libvirt/tests/src/migration/migrate_options_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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():
Expand Down