netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-09-08 14:05:41 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix housekeeping continues on error

Browse source
This commit is contained in:
deajan 2024-10-15 00:16:30 +02:00
parent eef5269375
commit 5e080e1fcf
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
npbackup/core/runner.py
View file

@ -1427,32 +1427,33 @@ class NPBackupRunner:
self.write_logs("Running housekeeping", level="info")
# Add special keywors __no_threads since we're already threaded in housekeeping function
# Also, pass it as kwargs to make linter happy
kwargs = {"__no_threads": True}
kwargs = {"__no_threads": True, "__close_queues": False}
# pylint: disable=E1123 (unexpected-keyword-arg)
unlock_result = self.unlock(**kwargs)
if unlock_result:
if (isinstance(unlock_result, bool) and unlock_result) or (isinstance(unlock_result, dict) and unlock_result["result"]):
check_result = self.check(**kwargs, read_data=False)
if check_result:
if (isinstance(check_result, bool) and check_result) or (isinstance(check_result, dict) and check_result["result"]):
# pylint: disable=E1123 (unexpected-keyword-arg)
forget_result = self.forget(use_policy=True, **kwargs)
if forget_result:
if (isinstance(forget_result, bool) and forget_result) or (isinstance(forget_result, dict) and forget_result["result"]):
# pylint: disable=E1123 (unexpected-keyword-arg)
prune_result = self.prune(**kwargs)
result = prune_result
else:
self.write_logs(
"Forget failed. Won't continue housekeeping on repo",
f"Forget failed. Won't continue housekeeping on repo {self.repo_config.g('name')}",
level="error",
)
result = forget_result
else:
self.write_logs(
"Check failed. Won't continue housekeeping on repo", level="error"
f"Check failed. Won't continue housekeeping on repo {self.repo_config.g('name')}", level="error"
)
result = check_result
else:
self.write_logs(
"Unlock failed. Won't continue housekeeping in repo", level="error"
f"Unlock failed. Won't continue housekeeping in repo {self.repo_config.g('name')}", level="error"
)
result = unlock_result