Compare commits

..

5 Commits

Author SHA1 Message Date
387fcfdf6b Bump version to 0.9.107 2025-02-10 23:15:21 -05:00
d695e855f9 Catch errors if snapshot fails to remove
A missing snapshot could cause an exception here which would break the
entire autobackup run. Catch the exception and continue on as this
should never be a fatal situation.
2025-02-10 16:33:44 -05:00
309b203f5d Bump version to 0.9.106 2024-12-09 16:45:10 -05:00
de4241161e Use stored_bytes in utilization calculation
used_bytes is a broken value since it does not take object replicas into
account, thus throwing off these calculations. Use stored_bytes instead
which properly represents this value.
2024-12-09 16:43:43 -05:00
1950d22876 Correct indentation 2024-11-26 13:38:51 -05:00
10 changed files with 41 additions and 20 deletions

View File

@ -1 +1 @@
0.9.105 0.9.107

View File

@ -1,5 +1,13 @@
## PVC Changelog ## PVC Changelog
###### [v0.9.107](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.107)
* [Worker Daemon] Fixes a bug where snapshot removal fails during autobackups
###### [v0.9.106](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.106)
* [API Daemon] Fixes a calculation bug when checking storage free space
###### [v0.9.105](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.105) ###### [v0.9.105](https://github.com/parallelvirtualcluster/pvc/releases/tag/v0.9.105)
* [API Daemon/Provisioner] Corrects some small bugs with OVA handling * [API Daemon/Provisioner] Corrects some small bugs with OVA handling

View File

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name="pvc", name="pvc",
version="0.9.105", version="0.9.107",
packages=["pvc.cli", "pvc.lib"], packages=["pvc.cli", "pvc.lib"],
install_requires=[ install_requires=[
"Click", "Click",

View File

@ -469,13 +469,14 @@ def run_vm_backup(zkhandler, celery, config, vm_detail, force_full=False):
if len(marked_for_deletion) > 0: if len(marked_for_deletion) > 0:
for backup_to_delete in marked_for_deletion: for backup_to_delete in marked_for_deletion:
try:
ret = vm.vm_worker_remove_snapshot( ret = vm.vm_worker_remove_snapshot(
zkhandler, None, vm_name, backup_to_delete["snapshot_name"] zkhandler, None, vm_name, backup_to_delete["snapshot_name"]
) )
if ret is False: except Exception:
error_message = f"Failed to remove obsolete backup snapshot '{backup_to_delete['snapshot_name']}', leaving in tracked backups" error_message = f"Failed to remove obsolete backup snapshot '{backup_to_delete['snapshot_name']}', removing from tracked backups anyways"
log_err(celery, error_message) log_err(celery, error_message)
else:
rmtree(f"{vm_backup_path}/{backup_to_delete['snapshot_name']}") rmtree(f"{vm_backup_path}/{backup_to_delete['snapshot_name']}")
tracked_backups.remove(backup_to_delete) tracked_backups.remove(backup_to_delete)

View File

@ -596,11 +596,11 @@ def add_volume(zkhandler, pool, name, size, force_flag=False, zk_only=False):
# Check if we're greater than 80% utilization after the create; error if so unless we have the force flag # Check if we're greater than 80% utilization after the create; error if so unless we have the force flag
pool_total_bytes = ( pool_total_bytes = (
int(pool_information["stats"]["used_bytes"]) + pool_total_free_bytes int(pool_information["stats"]["stored_bytes"]) + pool_total_free_bytes
) )
pool_safe_total_bytes = int(pool_total_bytes * 0.80) pool_safe_total_bytes = int(pool_total_bytes * 0.80)
pool_safe_free_bytes = pool_safe_total_bytes - int( pool_safe_free_bytes = pool_safe_total_bytes - int(
pool_information["stats"]["used_bytes"] pool_information["stats"]["stored_bytes"]
) )
if size_bytes >= pool_safe_free_bytes and not force_flag: if size_bytes >= pool_safe_free_bytes and not force_flag:
return ( return (
@ -656,11 +656,11 @@ def clone_volume(zkhandler, pool, name_src, name_new, force_flag=False):
# Check if we're greater than 80% utilization after the create; error if so unless we have the force flag # Check if we're greater than 80% utilization after the create; error if so unless we have the force flag
pool_total_bytes = ( pool_total_bytes = (
int(pool_information["stats"]["used_bytes"]) + pool_total_free_bytes int(pool_information["stats"]["stored_bytes"]) + pool_total_free_bytes
) )
pool_safe_total_bytes = int(pool_total_bytes * 0.80) pool_safe_total_bytes = int(pool_total_bytes * 0.80)
pool_safe_free_bytes = pool_safe_total_bytes - int( pool_safe_free_bytes = pool_safe_total_bytes - int(
pool_information["stats"]["used_bytes"] pool_information["stats"]["stored_bytes"]
) )
if size_bytes >= pool_safe_free_bytes and not force_flag: if size_bytes >= pool_safe_free_bytes and not force_flag:
return ( return (
@ -721,11 +721,11 @@ def resize_volume(zkhandler, pool, name, size, force_flag=False):
# Check if we're greater than 80% utilization after the create; error if so unless we have the force flag # Check if we're greater than 80% utilization after the create; error if so unless we have the force flag
pool_total_bytes = ( pool_total_bytes = (
int(pool_information["stats"]["used_bytes"]) + pool_total_free_bytes int(pool_information["stats"]["stored_bytes"]) + pool_total_free_bytes
) )
pool_safe_total_bytes = int(pool_total_bytes * 0.80) pool_safe_total_bytes = int(pool_total_bytes * 0.80)
pool_safe_free_bytes = pool_safe_total_bytes - int( pool_safe_free_bytes = pool_safe_total_bytes - int(
pool_information["stats"]["used_bytes"] pool_information["stats"]["stored_bytes"]
) )
if size_bytes >= pool_safe_free_bytes and not force_flag: if size_bytes >= pool_safe_free_bytes and not force_flag:
return ( return (

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
pvc (0.9.107-0) unstable; urgency=high
* [Worker Daemon] Fixes a bug where snapshot removal fails during autobackups
-- Joshua M. Boniface <joshua@boniface.me> Mon, 10 Feb 2025 23:15:21 -0500
pvc (0.9.106-0) unstable; urgency=high
* [API Daemon] Fixes a calculation bug when checking storage free space
-- Joshua M. Boniface <joshua@boniface.me> Mon, 09 Dec 2024 16:45:10 -0500
pvc (0.9.105-0) unstable; urgency=high pvc (0.9.105-0) unstable; urgency=high
* [API Daemon/Provisioner] Corrects some small bugs with OVA handling * [API Daemon/Provisioner] Corrects some small bugs with OVA handling

View File

@ -33,7 +33,7 @@ import os
import signal import signal
# Daemon version # Daemon version
version = "0.9.105" version = "0.9.107"
########################################################## ##########################################################

View File

@ -49,7 +49,7 @@ import re
import json import json
# Daemon version # Daemon version
version = "0.9.105" version = "0.9.107"
########################################################## ##########################################################

View File

@ -58,7 +58,7 @@ from daemon_lib.automirror import (
) )
# Daemon version # Daemon version
version = "0.9.105" version = "0.9.107"
config = cfg.get_configuration() config = cfg.get_configuration()