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

Remove is_backup flag for snapshots

Browse Source 
This won't be needed for anything.
This commit is contained in:
Joshua Boniface
2024-05-21 15:10:28 -04:00
parent 2b1082590e
commit fbd5b3cca3
5 changed files with 22 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
daemon-common/vm.py
View File

@@ -1249,7 +1249,7 @@ def get_list(
#
# VM Snapshot Tasks
#
def create_vm_snapshot(zkhandler, domain, snapshot_name=None, is_backup=False):
def create_vm_snapshot(zkhandler, domain, snapshot_name=None):
# Validate that VM exists in cluster
dom_uuid = getDomainUUID(zkhandler, domain)
if not dom_uuid:
@@ -1317,15 +1317,6 @@ def create_vm_snapshot(zkhandler, domain, snapshot_name=None, is_backup=False):
),
tstart,
),
(
(
"domain.snapshots",
dom_uuid,
"domain_snapshot.is_backup",
snapshot_name,
),
is_backup,
),
(
(
"domain.snapshots",
@@ -1355,7 +1346,7 @@ def create_vm_snapshot(zkhandler, domain, snapshot_name=None, is_backup=False):
)
def remove_vm_snapshot(zkhandler, domain, snapshot_name, remove_backup=False):
def remove_vm_snapshot(zkhandler, domain, snapshot_name):
# Validate that VM exists in cluster
dom_uuid = getDomainUUID(zkhandler, domain)
if not dom_uuid:
@@ -1369,30 +1360,6 @@ def remove_vm_snapshot(zkhandler, domain, snapshot_name, remove_backup=False):
f'ERROR: Could not find snapshot "{snapshot_name}" of VM "{domain}"!',
)
print(
zkhandler.read(
("domain.snapshots", dom_uuid, "domain_snapshot.is_backup", snapshot_name)
)
)
if (
strtobool(
zkhandler.read(
(
"domain.snapshots",
dom_uuid,
"domain_snapshot.is_backup",
snapshot_name,
)
)
)
and not remove_backup
):
# Disallow removing backups normally, but expose `remove_backup` flag for internal usage by refactored backup handlers
return (
False,
f'ERROR: Snapshot "{snapshot_name}" of VM "{domain}" is a backup; please remove with "pvc backup"!',
)
tstart = time.time()
_snapshots = zkhandler.read(