comments #2

cvat-ai · Oct 9, 2024 · 8e6b130 · 8e6b130
1 parent d1ac9ef
commit 8e6b130
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/changelog.d/20241009_164505_andrey_k8s_probes.md b/changelog.d/20241009_164505_andrey_k8s_probes.md
@@ -0,0 +1,4 @@
+### Added
+
+- \[Helm\] Readiness and liveness probes
+  (<https://github.com/cvat-ai/cvat/pull/8488>)
diff --git a/cvat/apps/health/management/commands/__init__.py b/cvat/apps/health/management/commands/__init__.py
diff --git a/tests/python/shared/fixtures/init.py b/tests/python/shared/fixtures/init.py
@@ -238,14 +238,17 @@ def kube_restore_clickhouse_db():
         ]
     )
 
+def _get_redis_inmem_keys_to_keep():
+    return ("rq:worker:", "rq:workers", "rq:scheduler_instance:", "rq:queues:")
 
 def docker_restore_redis_inmem():
     docker_exec_redis_inmem(
         [
             "sh",
             "-c",
-            "for p in rq:job:* rq:wip:* rq:finished:* rq:failed:*; "
-            'do redis-cli -e --scan --pattern "$p" | xargs -r redis-cli -e del ; done',
+            'redis-cli -e --scan --pattern "*" |'
+            'grep -v "' + '\|'.join(_get_redis_inmem_keys_to_keep()) + '" |'
+            'xargs -r redis-cli -e del',
         ]
     )
 
@@ -255,9 +258,9 @@ def kube_restore_redis_inmem():
         [
             "sh",
             "-c",
-            "for p in rq:job:* rq:wip:* rq:finished:* rq:failed:*; "
-            'do redis-cli -e -a "${REDIS_PASSWORD}" --scan --pattern "$p" | '
-            'xargs -r redis-cli -e -a "${REDIS_PASSWORD}" del ; done',
+            'redis-cli -e -a "${REDIS_PASSWORD}" --scan --pattern "*" |'
+            'grep -v "' + '\|'.join(_get_redis_inmem_keys_to_keep()) + '" |'
+            'xargs -r redis-cli -e -a "${REDIS_PASSWORD}" del',
         ]
     )