[checkmk-commits] DCD: Improve removal of vanished piggyback hosts

Module: check_mk Branch: master Commit: 866210246d31180947ccb753ccb1ad92d89cad2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=866210246d3118… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 8 12:54:37 2019 +0200 DCD: Improve removal of vanished piggyback hosts The DCD now uses the piggyback data processing logic of Check_MK base to invalidate outdated piggyback data. This makes the DCD able to remove vanished piggyback hosts as soon as they are not relevant anymore for Check_MK base. CMK-1944 Change-Id: Ic7acca696fd80c2933a0e712178abb73bd756069 --- cmk_base/piggyback.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cmk_base/piggyback.py b/cmk_base/piggyback.py index 48b7feb..5379c82 100644 --- a/cmk_base/piggyback.py +++ b/cmk_base/piggyback.py @@ -47,8 +47,8 @@ def get_piggyback_raw_data(piggyback_max_cachefile_age, hostname): return [] piggyback_data = [] - for source_host, piggyback_file_path in _get_piggyback_files(piggyback_max_cachefile_age, - hostname): + for source_host, piggyback_file_path in get_piggyback_files(piggyback_max_cachefile_age, + hostname): try: raw_data = file(piggyback_file_path).read() except IOError as e: @@ -62,14 +62,14 @@ def get_piggyback_raw_data(piggyback_max_cachefile_age, hostname): def has_piggyback_raw_data(piggyback_max_cachefile_age, hostname): - return _get_piggyback_files(piggyback_max_cachefile_age, hostname) != [] + return get_piggyback_files(piggyback_max_cachefile_age, hostname) != [] -def _get_piggyback_files(piggyback_max_cachefile_age, hostname): +def get_piggyback_files(piggyback_max_cachefile_age, hostname): """Gather a list of piggyback files to read for further processing. Please note that there may be multiple parallel calls executing the - _get_piggyback_files(), store_piggyback_raw_data() or cleanup_piggyback_files() + get_piggyback_files(), store_piggyback_raw_data() or cleanup_piggyback_files() functions. Therefor all these functions needs to deal with suddenly vanishing or updated files/directories. """ @@ -215,7 +215,7 @@ def cleanup_piggyback_files(piggyback_max_cachefile_age): # Cleanup empty backed host directories below "piggyback" Please note that there may be multiple parallel calls executing the - _get_piggyback_files(), store_piggyback_raw_data() or cleanup_piggyback_files() + get_piggyback_files(), store_piggyback_raw_data() or cleanup_piggyback_files() functions. Therefor all these functions needs to deal with suddenly vanishing or updated files/directories. """ @@ -245,7 +245,7 @@ def _cleanup_old_source_status_files(piggyback_max_cachefile_age): def _cleanup_old_piggybacked_files(piggyback_max_cachefile_age): """Remove piggyback data that is not needed anymore - The monitoring (_get_piggyback_files()) is already skipping these files, + The monitoring (get_piggyback_files()) is already skipping these files, but we need some cleanup mechanism. - Remove all piggyback files created by sources without status file