[checkmk-commits] Restore of backups cleans up backup job states

Module: check_mk Branch: master Commit: 14fd737950040bf43eef559c53ecd885d2c3b44d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14fd737950040b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 26 17:58:13 2016 +0200 Restore of backups cleans up backup job states --- bin/.f12 | 2 +- bin/mkbackup | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bin/.f12 b/bin/.f12 index 5b9bf09..f9f022e 100644 --- a/bin/.f12 +++ b/bin/.f12 @@ -4,7 +4,7 @@ SITE=${SITE:-$(omd sites --bare | head -n 1)} OMD_ROOT=/omd/sites/${SITE} make -sudo install -m 755 mkeventd mkeventd_open514 mkevent mkbackup pwquery $OMD_ROOT/bin/ +sudo install -m 755 mkeventd mkeventd_open514 mkevent mkbackup $OMD_ROOT/bin/ sudo chown root.omd $OMD_ROOT/bin/mkeventd_open514 sudo chmod 4750 $OMD_ROOT/bin/mkeventd_open514 echo "Installed to $OMD_ROOT/bin" diff --git a/bin/mkbackup b/bin/mkbackup index 18926be..e791c8d 100755 --- a/bin/mkbackup +++ b/bin/mkbackup @@ -1373,6 +1373,19 @@ def state_path(): return "%s/%s.state" % (path, name) +def cleanup_backup_job_states(): + if is_root(): + path = "/var/lib/mkbackup" + else: + path = "%s/var/check_mk/backup" % os.environ["OMD_ROOT"] + + for f in glob.glob("%s/*.state" % path): + if "/restore.state" in f or "/restore-" in f: + continue + + os.unlink(f) + + def add_output(s): state = load_state() state["output"] += s @@ -1740,6 +1753,7 @@ def read_from_tarfile_threaded(s, pipeout_fd): def complete_restore(): + cleanup_backup_job_states() state = load_state() duration = time.time() - state["started"] log("--- Restore completed (Duration: %s, IO: %s/s) ---" %