x/vmware-nsx
Code Issues Proposed changes

MP2P migration: no retry & long wait for rollbacks

Browse Source 
Change-Id: I23d9c92492193dee35371124cf1fc4250426b90a
This commit is contained in:
asarfaty 2020-11-29 12:13:18 +02:00 committed by Adit Sarfaty
parent 5da150fcd2
commit 33c3760669
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py
View File

@ -114,9 +114,12 @@ def send_migration_request(nsxlib, body):
return nsxlib.client.url_post("migration/mp-to-policy", body)
def send_rollback_request(nsxlib, body):
def send_rollback_request(body):
#TODO(asarfaty): Rollback can take very long, especially for firewall
# sections. In this case backup-restore might be better
# Using a new nsxlib instance to avoid retries, and add a long timeout
nsxlib = _get_nsxlib_from_config(verbose=True, for_end_api=True)
return nsxlib.client.url_post("migration/mp-to-policy/rollback", body)
@ -1272,8 +1275,8 @@ def migrate_t_resources_2_p(nsxlib, nsxpolicy, plugin):
global ROLLBACK_DATA
if ROLLBACK_DATA:
LOG.info("Rolling migration back %s", ROLLBACK_DATA)
send_rollback_request(nsxlib,
{'migration_data': ROLLBACK_DATA})
send_rollback_request({'migration_data': ROLLBACK_DATA})
LOG.info("Roll back done.")
# Finalize the migration (Also needed after rollback)
end_migration_process()
# Stop the migration service