From 6f6ca84dae966fe7764dec596ea501047f8b8789 Mon Sep 17 00:00:00 2001 From: wizardchen Date: Wed, 10 Sep 2025 20:12:37 +0800 Subject: [PATCH] feat(docreader): add health check --- docker-compose.yml | 8 ++++++++ docker/Dockerfile.docreader | 6 ++++++ services/docreader/requirements.txt | 1 + services/docreader/src/server/server.py | 8 +++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9af3f413..9499cffe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,6 +68,8 @@ services: condition: service_healthy minio: condition: service_started + docreader: + condition: service_healthy networks: - WeKnora-network restart: unless-stopped @@ -129,6 +131,12 @@ services: - MINIO_BUCKET_NAME=${MINIO_BUCKET_NAME} - MINIO_USE_SSL=${MINIO_USE_SSL} - WEB_PROXY=${WEB_PROXY} + healthcheck: + test: ["CMD", "grpc_health_probe", "-addr=:50051"] + interval: 30s + timeout: 10s + retries: 3 + start_period: 60s networks: - WeKnora-network restart: unless-stopped diff --git a/docker/Dockerfile.docreader b/docker/Dockerfile.docreader index d512749c..e90be5df 100644 --- a/docker/Dockerfile.docreader +++ b/docker/Dockerfile.docreader @@ -114,7 +114,13 @@ RUN apt-get update && apt-get install -y \ libglu1-mesa \ libsm6 \ libreoffice \ + curl \ && rm -rf /var/lib/apt/lists/* + +# 安装 grpc_health_probe +RUN GRPC_HEALTH_PROBE_VERSION=v0.4.24 && \ + wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \ + chmod +x /bin/grpc_health_probe # 从构建阶段复制已安装的依赖和生成的代码 COPY --from=builder /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages diff --git a/services/docreader/requirements.txt b/services/docreader/requirements.txt index d6e6afab..afef307d 100644 --- a/services/docreader/requirements.txt +++ b/services/docreader/requirements.txt @@ -1,5 +1,6 @@ grpcio grpcio-tools +grpcio-health-checking protobuf python-docx PyPDF2 diff --git a/services/docreader/src/server/server.py b/services/docreader/src/server/server.py index 988ba36a..9018d3e2 100644 --- a/services/docreader/src/server/server.py +++ b/services/docreader/src/server/server.py @@ -6,6 +6,8 @@ import traceback import grpc import uuid import atexit +from grpc_health.v1 import health_pb2_grpc +from grpc_health.v1.health import HealthServicer # Add parent directory to Python path current_dir = os.path.dirname(os.path.abspath(__file__)) @@ -348,9 +350,13 @@ def serve(): ], ) - # Register service + # Register services docreader_pb2_grpc.add_DocReaderServicer_to_server(DocReaderServicer(), server) + # Register health check service + health_servicer = HealthServicer() + health_pb2_grpc.add_HealthServicer_to_server(health_servicer, server) + # Set listen address server.add_insecure_port(f"[::]:{port}")