From 510df8513b671a02224a1d6cb43ac71e13147c5b Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Mon, 4 Nov 2024 14:53:37 +0100 Subject: [PATCH 1/3] fix healthcheck --- .../src/simcore_service_api_server/core/health_checker.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/api-server/src/simcore_service_api_server/core/health_checker.py b/services/api-server/src/simcore_service_api_server/core/health_checker.py index 8dcba7422ec1..186337243d9f 100644 --- a/services/api-server/src/simcore_service_api_server/core/health_checker.py +++ b/services/api-server/src/simcore_service_api_server/core/health_checker.py @@ -69,7 +69,9 @@ async def teardown(self): @property def healthy(self) -> bool: - return self._health_check_failure_count <= self._allowed_health_check_failures + return self._rabbit_client.healthy and ( + self._health_check_failure_count <= self._allowed_health_check_failures + ) @property def health_check_failure_count(self) -> NonNegativeInt: From f62693a3d5204a63942981c0d5a9088aa79dfe95 Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Mon, 4 Nov 2024 15:19:28 +0100 Subject: [PATCH 2/3] cleanup --- .../src/simcore_service_api_server/core/health_checker.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/services/api-server/src/simcore_service_api_server/core/health_checker.py b/services/api-server/src/simcore_service_api_server/core/health_checker.py index 186337243d9f..988e705658dc 100644 --- a/services/api-server/src/simcore_service_api_server/core/health_checker.py +++ b/services/api-server/src/simcore_service_api_server/core/health_checker.py @@ -84,9 +84,6 @@ async def _background_task_method(self): while self._dummy_queue.qsize() > 0: _ = self._dummy_queue.get_nowait() try: - if not self._rabbit_client.healthy: - self._increment_health_check_failure_count() - return await asyncio.wait_for( self._rabbit_client.publish( self._dummy_message.channel_name, self._dummy_message From 2a669555e4db907fbb17aac00c12f6181a4ef26d Mon Sep 17 00:00:00 2001 From: Mads Bisgaard Date: Fri, 8 Nov 2024 14:33:43 +0100 Subject: [PATCH 3/3] @pcrespov add comment to changed line --- .../src/simcore_service_api_server/core/health_checker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/api-server/src/simcore_service_api_server/core/health_checker.py b/services/api-server/src/simcore_service_api_server/core/health_checker.py index 988e705658dc..068b2d79f37c 100644 --- a/services/api-server/src/simcore_service_api_server/core/health_checker.py +++ b/services/api-server/src/simcore_service_api_server/core/health_checker.py @@ -71,7 +71,7 @@ async def teardown(self): def healthy(self) -> bool: return self._rabbit_client.healthy and ( self._health_check_failure_count <= self._allowed_health_check_failures - ) + ) # https://github.com/ITISFoundation/osparc-simcore/pull/6662 @property def health_check_failure_count(self) -> NonNegativeInt: