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

Add runtime and adjust ordering

This commit is contained in:
Joshua Boniface 2023-10-17 12:32:40 -04:00
parent f3bc4dee04
commit 5d0c674d1d
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon-common/vm.py
View File

@ -1308,6 +1308,8 @@ def backup_vm(
zkhandler, domain, target_path, incremental_parent=None, retain_snapshots=False zkhandler, domain, target_path, incremental_parent=None, retain_snapshots=False
): ):
tstart = datetime.now()
# 0. Validations # 0. Validations
# Validate that VM exists in cluster # Validate that VM exists in cluster
dom_uuid = getDomainUUID(zkhandler, domain) dom_uuid = getDomainUUID(zkhandler, domain)
@ -1438,10 +1440,10 @@ def backup_vm(
jdump(vm_backup, fh) jdump(vm_backup, fh)
# 8. Remove snapshots if retain_snapshot is False # 8. Remove snapshots if retain_snapshot is False
if not retain_snapshots:
is_snapshot_remove_failed = False is_snapshot_remove_failed = False
which_snapshot_remove_failed = list() which_snapshot_remove_failed = list()
msg_snapshot_remove_failed = list() msg_snapshot_remove_failed = list()
if not retain_snapshots:
for pool, volume in vm_volumes: for pool, volume in vm_volumes:
if ceph.verifySnapshot(zkhandler, pool, volume, snapshot_name): if ceph.verifySnapshot(zkhandler, pool, volume, snapshot_name):
retcode, retmsg = ceph.remove_snapshot( retcode, retmsg = ceph.remove_snapshot(
@ -1452,13 +1454,16 @@ def backup_vm(
which_snapshot_remove_failed.append(f"{pool}/{volume}") which_snapshot_remove_failed.append(f"{pool}/{volume}")
msg_snapshot_remove_failed.append(retmsg) msg_snapshot_remove_failed.append(retmsg)
tend = datetime.now()
ttot = (tend - tstart).total_seconds()
if is_snapshot_remove_failed: if is_snapshot_remove_failed:
return ( return (
True, True,
f'WARNING: Successfully backed up VM {domain} ({backup_type}@{datestring}) to {target_path}, but failed to remove snapshot as requested for volume(s) {", ".join(which_snapshot_remove_failed)}: {", ".join(msg_snapshot_remove_failed)}', f'WARNING: Successfully backed up VM {domain} ({backup_type} @ {datestring}) to {target_path} in {ttot} seconds, but failed to remove snapshot as requested for volume(s) {", ".join(which_snapshot_remove_failed)}: {", ".join(msg_snapshot_remove_failed)}',
) )
return ( return (
True, True,
f"Successfully backed up VM {domain} ({backup_type}@{datestring}) to {target_path}", f"Successfully backed up VM {domain} ({backup_type} @ {datestring}) to {target_path} in {ttot} seconds",
) )