43 lines
2.3 KiB
Diff
43 lines
2.3 KiB
Diff
|
From 5bfde56d1130572e9bf76dd0fc40a5f0a34923d2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhongtao <zhongtao17@huawei.com>
|
||
|
|
Date: Sun, 14 May 2023 14:02:48 +0800
|
||
|
|
Subject: [PATCH 3/9] fix health_check.sh
|
||
|
|
|
||
|
|
Signed-off-by: zhongtao <zhongtao17@huawei.com>
|
||
|
|
---
|
||
|
|
CI/test_cases/container_cases/health_check.sh | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CI/test_cases/container_cases/health_check.sh b/CI/test_cases/container_cases/health_check.sh
|
||
|
|
index 621574cd..1542bd09 100755
|
||
|
|
--- a/CI/test_cases/container_cases/health_check.sh
|
||
|
|
+++ b/CI/test_cases/container_cases/health_check.sh
|
||
|
|
@@ -103,7 +103,7 @@ function test_health_check_normally()
|
||
|
|
[[ $(isula inspect -f '{{.State.Health.Status}}' ${container_name}) == "healthy" ]]
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - incorrent container health check status: not healthy" && ((ret++))
|
||
|
|
|
||
|
|
- kill -9 $(isula inspect -f '{{.State.Pid}}' ${container_name}) && sleep 1 # Wait for the container to be killed
|
||
|
|
+ kill -9 $(isula inspect -f '{{.State.Pid}}' ${container_name}) && sleep 2 # Wait for the container to be killed
|
||
|
|
|
||
|
|
# The container process exits abnormally and the health check status becomes unhealthy
|
||
|
|
[[ $(isula inspect -f '{{.State.Health.Status}}' ${container_name}) == "unhealthy" ]]
|
||
|
|
@@ -139,13 +139,13 @@ function test_health_check_timeout()
|
||
|
|
[[ $(isula inspect -f '{{.State.Status}}' ${container_name}) == "running" ]]
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - incorrent container status: not running" && ((ret++))
|
||
|
|
|
||
|
|
- sleep 1 # Health check has been performed yet
|
||
|
|
+ sleep 2 # Health check has been performed yet
|
||
|
|
|
||
|
|
# Initial status when the container is still starting
|
||
|
|
[[ $(isula inspect -f '{{.State.Health.Status}}' ${container_name}) == "starting" ]]
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - incorrent container health check status: not starting" && ((ret++))
|
||
|
|
|
||
|
|
- sleep 7 # finish first health check
|
||
|
|
+ sleep 10 # finish first health check
|
||
|
|
# The container process exits and the health check status becomes unhealthy
|
||
|
|
[[ $(isula inspect -f '{{.State.Health.Status}}' ${container_name}) == "unhealthy" ]]
|
||
|
|
[[ $? -ne 0 ]] && msg_err "${FUNCNAME[0]}:${LINENO} - incorrent container health check status: not unhealthy" && ((ret++))
|
||
|
|
--
|
||
|
|
2.40.1
|
||
|
|
|