parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Fix ordering bug with vm_detail

This commit is contained in:
Joshua Boniface 2024-10-09 00:33:00 -04:00
parent 7ba75adef4
commit 16eb09dc22
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon-common/vm.py
View File

@ -3958,6 +3958,9 @@ def vm_worker_create_mirror(
# 2. Send snapshot to remote # 2. Send snapshot to remote
# #
# Re-get our side's VM configuration details (since we now have the snapshot)
vm_detail = get_list(zkhandler, limit=dom_uuid, is_fuzzy=False)[1][0]
# Determine if there's a valid shared snapshot to send an incremental diff from # Determine if there's a valid shared snapshot to send an incremental diff from
if destination_vm_detail: if destination_vm_detail:
local_snapshots = {s["name"] for s in vm_detail["snapshots"]} local_snapshots = {s["name"] for s in vm_detail["snapshots"]}
@ -4570,9 +4573,12 @@ def vm_worker_promote_mirror(
) )
# #
# 2. Send snapshot to remote # 3. Send snapshot to remote
# #
# Re-get our side's VM configuration details (since we now have the snapshot)
vm_detail = get_list(zkhandler, limit=dom_uuid, is_fuzzy=False)[1][0]
# Determine if there's a valid shared snapshot to send an incremental diff from # Determine if there's a valid shared snapshot to send an incremental diff from
local_snapshots = {s["name"] for s in vm_detail["snapshots"]} local_snapshots = {s["name"] for s in vm_detail["snapshots"]}
remote_snapshots = {s["name"] for s in destination_vm_detail["snapshots"]} remote_snapshots = {s["name"] for s in destination_vm_detail["snapshots"]}
@ -4922,7 +4928,10 @@ def vm_worker_promote_mirror(
) )
return False return False
#
# 5. Set mirror state OR remove VM # 5. Set mirror state OR remove VM
#
if remove_on_source: if remove_on_source:
current_stage += 1 current_stage += 1
update( update(