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

Use more hierarchical backup path structure

This commit is contained in:
Joshua Boniface 2023-10-24 01:40:56 -04:00
parent 83b937654c
commit 35f80e544c
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
daemon-common/vm.py
View File

@ -30,7 +30,6 @@ from datetime import datetime
from distutils.util import strtobool from distutils.util import strtobool
from json import dump as jdump from json import dump as jdump
from json import load as jload from json import load as jload
from os import remove
from shutil import rmtree from shutil import rmtree
from socket import gethostname from socket import gethostname
from uuid import UUID from uuid import UUID
@ -1403,7 +1402,7 @@ def backup_vm(
# 4. Create destination directory # 4. Create destination directory
vm_target_root = f"{backup_path}/{domain}" vm_target_root = f"{backup_path}/{domain}"
vm_target_backup = f"{backup_path}/{domain}/{domain}.{datestring}.pvcdisks" vm_target_backup = f"{backup_path}/{domain}/{datestring}/pvcdisks"
if not os.path.isdir(vm_target_backup): if not os.path.isdir(vm_target_backup):
try: try:
os.makedirs(vm_target_backup) os.makedirs(vm_target_backup)
@ -1471,11 +1470,10 @@ def backup_vm(
"retained_snapshot": retain_snapshot, "retained_snapshot": retain_snapshot,
"vm_detail": vm_detail, "vm_detail": vm_detail,
"backup_files": [ "backup_files": [
(f"{domain}.{datestring}.pvcdisks/{p}.{v}.{export_fileext}", s) (f"pvcdisks/{p}.{v}.{export_fileext}", s) for p, v, s in vm_volumes
for p, v, s in vm_volumes
], ],
} }
with open(f"{vm_target_root}/{domain}.{datestring}.pvcbackup", "w") as fh: with open(f"{vm_target_root}/{datestring}/pvcbackup.json", "w") as fh:
jdump(vm_backup, fh) jdump(vm_backup, fh)
# 8. Remove snapshots if retain_snapshot is False # 8. Remove snapshots if retain_snapshot is False
@ -1536,18 +1534,16 @@ def remove_backup(zkhandler, domain, backup_path, datestring):
return False, f"ERROR: Source path {backup_path} does not exist!" return False, f"ERROR: Source path {backup_path} does not exist!"
# Ensure that domain path (on this node) exists # Ensure that domain path (on this node) exists
backup_backup_path = f"{backup_path}/{domain}" vm_backup_path = f"{backup_path}/{domain}"
if not os.path.isdir(backup_backup_path): if not os.path.isdir(vm_backup_path):
return False, f"ERROR: Source VM path {backup_backup_path} does not exist!" return False, f"ERROR: Source VM path {vm_backup_path} does not exist!"
# Ensure that the archives are present # Ensure that the archives are present
backup_source_pvcbackup_file = ( backup_source_pvcbackup_file = f"{vm_backup_path}/{datestring}/pvcbackup.json"
f"{backup_backup_path}/{domain}.{datestring}.pvcbackup"
)
if not os.path.isfile(backup_source_pvcbackup_file): if not os.path.isfile(backup_source_pvcbackup_file):
return False, "ERROR: The specified source backup files do not exist!" return False, "ERROR: The specified source backup files do not exist!"
backup_source_pvcdisks_path = f"{backup_backup_path}/{domain}.{datestring}.pvcdisks" backup_source_pvcdisks_path = f"{vm_backup_path}/{datestring}/pvcdisks"
if not os.path.isdir(backup_source_pvcdisks_path): if not os.path.isdir(backup_source_pvcdisks_path):
return False, "ERROR: The specified source backup files do not exist!" return False, "ERROR: The specified source backup files do not exist!"
@ -1576,8 +1572,7 @@ def remove_backup(zkhandler, domain, backup_path, datestring):
is_files_remove_failed = False is_files_remove_failed = False
msg_files_remove_failed = None msg_files_remove_failed = None
try: try:
remove(backup_source_pvcbackup_file) rmtree(f"{vm_backup_path}/{datestring}")
rmtree(backup_source_pvcdisks_path)
except Exception as e: except Exception as e:
is_files_remove_failed = True is_files_remove_failed = True
msg_files_remove_failed = e msg_files_remove_failed = e
@ -1628,14 +1623,12 @@ def restore_vm(zkhandler, domain, backup_path, datestring, retain_snapshot=False
return False, f"ERROR: Source path {backup_path} does not exist!" return False, f"ERROR: Source path {backup_path} does not exist!"
# Ensure that domain path (on this node) exists # Ensure that domain path (on this node) exists
backup_backup_path = f"{backup_path}/{domain}" vm_backup_path = f"{backup_path}/{domain}"
if not os.path.isdir(backup_backup_path): if not os.path.isdir(vm_backup_path):
return False, f"ERROR: Source VM path {backup_backup_path} does not exist!" return False, f"ERROR: Source VM path {vm_backup_path} does not exist!"
# Ensure that the archives are present # Ensure that the archives are present
backup_source_pvcbackup_file = ( backup_source_pvcbackup_file = f"{vm_backup_path}/{datestring}/pvcbackup.json"
f"{backup_backup_path}/{domain}.{datestring}.pvcbackup"
)
if not os.path.isfile(backup_source_pvcbackup_file): if not os.path.isfile(backup_source_pvcbackup_file):
return False, "ERROR: The specified source backup files do not exist!" return False, "ERROR: The specified source backup files do not exist!"
@ -1650,7 +1643,7 @@ def restore_vm(zkhandler, domain, backup_path, datestring, retain_snapshot=False
incremental_parent = backup_source_details.get("incremental_parent", None) incremental_parent = backup_source_details.get("incremental_parent", None)
if incremental_parent is not None: if incremental_parent is not None:
backup_source_parent_pvcbackup_file = ( backup_source_parent_pvcbackup_file = (
f"{backup_backup_path}/{domain}.{incremental_parent}.pvcbackup" f"{vm_backup_path}/{incremental_parent}/pvcbackup.json"
) )
if not os.path.isfile(backup_source_parent_pvcbackup_file): if not os.path.isfile(backup_source_parent_pvcbackup_file):
return ( return (
@ -1726,7 +1719,7 @@ def restore_vm(zkhandler, domain, backup_path, datestring, retain_snapshot=False
# Next we import the parent images # Next we import the parent images
retcode, stdout, stderr = common.run_os_command( retcode, stdout, stderr = common.run_os_command(
f"rbd import --export-format 2 --dest-pool {pool} {backup_path}/{domain}/{parent_volume_file} {volume}" f"rbd import --export-format 2 --dest-pool {pool} {backup_path}/{domain}/{incremental_parent}/{parent_volume_file} {volume}"
) )
if retcode: if retcode:
return ( return (
@ -1736,7 +1729,7 @@ def restore_vm(zkhandler, domain, backup_path, datestring, retain_snapshot=False
# Then we import the incremental diffs # Then we import the incremental diffs
retcode, stdout, stderr = common.run_os_command( retcode, stdout, stderr = common.run_os_command(
f"rbd import-diff {backup_path}/{domain}/{volume_file} {pool}/{volume}" f"rbd import-diff {backup_path}/{domain}/{datestring}/{volume_file} {pool}/{volume}"
) )
if retcode: if retcode:
return ( return (
@ -1798,7 +1791,7 @@ def restore_vm(zkhandler, domain, backup_path, datestring, retain_snapshot=False
# Then we perform the actual import # Then we perform the actual import
retcode, stdout, stderr = common.run_os_command( retcode, stdout, stderr = common.run_os_command(
f"rbd import --export-format 2 --dest-pool {pool} {backup_path}/{domain}/{volume_file} {volume}" f"rbd import --export-format 2 --dest-pool {pool} {backup_path}/{domain}/{datestring}/{volume_file} {volume}"
) )
if retcode: if retcode:
return ( return (