minor: 后台检测缓存清理优化

TencentBlueKing · Sep 25, 2024 · 3859a7c · 3859a7c
1 parent 9f80333
commit 3859a7c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/bkmonitor/alarm_backends/core/detect_result/__init__.py b/bkmonitor/alarm_backends/core/detect_result/__init__.py
@@ -18,7 +18,7 @@
 )
 from alarm_backends.core.cache import key
 
-CONST_MAX_LEN_CHECK_RESULT = 60  # 检测结果缓存，默认只保留60条数据
+CONST_MAX_LEN_CHECK_RESULT = 30  # 检测结果缓存，默认只保留30条数据
 
 ANOMALY_LABEL = "ANOMALY"  # 异常标识
 

diff --git a/bkmonitor/alarm_backends/core/detect_result/clean.py b/bkmonitor/alarm_backends/core/detect_result/clean.py
@@ -44,7 +44,11 @@ def clean_expired_detect_result(strategy_range=None):
         pipeline = client.pipeline()
         total = len(strategies)
         step = int(total / 100)
-        wait_signals = list(range(step, total, step))
+        if step < 5:
+            wait_signals = []
+        else:
+            wait_signals = list(range(step, total, step))
+        last_sleep_time = time.time()
         for s_id, strategy in enumerate(strategies):
             # 按照策略的检测与恢复周期配置，决定保留多少个周期的检测结果
             point_remain = detect_result_point_required(strategy)
@@ -101,7 +105,11 @@ def clean_expired_detect_result(strategy_range=None):
 
             # redis 性能缓冲, 避免清理任务占满redis cpu
             if s_id in wait_signals:
-                time.sleep(1)
+                now = time.time()
+                clean_duration = now - last_sleep_time
+                if clean_duration > 1:
+                    time.sleep(clean_duration)
+                    last_sleep_time = now
 
     @staticmethod
     def clean_md5_to_dimension_cache():