[chg] Use redis lock to avoid conflicting cache access and simultaneous check runs

Author: j-a-n

opsiconfd/check/cache.py

@@ -13,19 +13,20 @@
 from redis.exceptions import ConnectionError
 
 from opsiconfd.logging import logger
-from opsiconfd.redis import delete_recursively
+from opsiconfd.redis import delete_recursively, redis_lock
 
 
 def check_cache_clear(cache_id: str = "all") -> Any:
-	try:
-		logger.debug("Clearing check cache: %s", cache_id)
-		redis_key = "opsiconfd:checkcache"
-		if cache_id != "all":
-			redis_key = f"{redis_key}:{cache_id}"
-		delete_recursively(redis_key)
-	except ConnectionError as err:
-		logger.warning("Could not clear check cache. No Connection to Redis.")
-		logger.debug(err)
+	with redis_lock("check-cache", acquire_timeout=60.0, lock_timeout=300.0):
+		try:
+			logger.debug("Clearing check cache: %s", cache_id)
+			redis_key = "opsiconfd:checkcache"
+			if cache_id != "all":
+				redis_key = f"{redis_key}:{cache_id}"
+			delete_recursively(redis_key)
+		except ConnectionError as err:
+			logger.warning("Could not clear check cache. No Connection to Redis.")
+			logger.debug(err)
 
 
 def clear_check_cache(

opsiconfd/check/cli.py

@@ -115,6 +115,7 @@ def console_health_check() -> int:
 			check_version = "1000"
 		else:
 			check_version = config.upgrade_check
+
 	if config.clear_cache:
 		check_cache_clear("all")
 

opsiconfd/check/main.py

@@ -11,14 +11,16 @@
 
 from opsiconfd.check.common import CheckResult, check_manager
 from opsiconfd.logging import logger
+from opsiconfd.redis import redis_lock
 
 
 def health_check(clear_cache: bool = False) -> Iterator[CheckResult]:
 	from opsiconfd.check.register import register_checks
 
-	register_checks()
-	if not check_manager.check_ids:
-		logger.error("No valid checks selected. Please check your configuration.")
-		return
-	for check in check_manager:
-		yield check.run(clear_cache)
+	with redis_lock("check-cache", acquire_timeout=60.0, lock_timeout=300.0):
+		register_checks()
+		if not check_manager.check_ids:
+			logger.error("No valid checks selected. Please check your configuration.")
+			return
+		for check in check_manager:
+			yield check.run(clear_cache)