From 28f5c37211bb884928dd7d11545c7c188d55b9a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B9=9B=E9=9C=B2=E5=85=88=E7=94=9F?=
 <zhanluxianshen@163.com>
Date: Fri, 27 Jun 2025 17:37:11 +0800
Subject: [PATCH] Add Env 'CELERY_SENTINEL_PASSWORD' for celery connect redis
 sentinel. (#21198)

---
 api/configs/middleware/__init__.py | 4 ++++
 api/extensions/ext_celery.py       | 1 +
 docker/.env.example                | 1 +
 docker/docker-compose.yaml         | 1 +
 4 files changed, 7 insertions(+)

diff --git a/api/configs/middleware/__init__.py b/api/configs/middleware/__init__.py
index 60ba272ec..427602676 100644
--- a/api/configs/middleware/__init__.py
+++ b/api/configs/middleware/__init__.py
@@ -223,6 +223,10 @@ class CeleryConfig(DatabaseConfig):
         default=None,
     )
 
+    CELERY_SENTINEL_PASSWORD: Optional[str] = Field(
+        description="Password of the Redis Sentinel master.",
+        default=None,
+    )
     CELERY_SENTINEL_SOCKET_TIMEOUT: Optional[PositiveFloat] = Field(
         description="Timeout for Redis Sentinel socket operations in seconds.",
         default=0.1,
diff --git a/api/extensions/ext_celery.py b/api/extensions/ext_celery.py
index a83755200..6279b1ad3 100644
--- a/api/extensions/ext_celery.py
+++ b/api/extensions/ext_celery.py
@@ -21,6 +21,7 @@ def init_app(app: DifyApp) -> Celery:
             "master_name": dify_config.CELERY_SENTINEL_MASTER_NAME,
             "sentinel_kwargs": {
                 "socket_timeout": dify_config.CELERY_SENTINEL_SOCKET_TIMEOUT,
+                "password": dify_config.CELERY_SENTINEL_PASSWORD,
             },
         }
 
diff --git a/docker/.env.example b/docker/.env.example
index 275da8e2e..a024566c8 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -285,6 +285,7 @@ BROKER_USE_SSL=false
 # If you are using Redis Sentinel for high availability, configure the following settings.
 CELERY_USE_SENTINEL=false
 CELERY_SENTINEL_MASTER_NAME=
+CELERY_SENTINEL_PASSWORD=
 CELERY_SENTINEL_SOCKET_TIMEOUT=0.1
 
 # ------------------------------
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 001983535..0d187176b 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -79,6 +79,7 @@ x-shared-env: &shared-api-worker-env
   BROKER_USE_SSL: ${BROKER_USE_SSL:-false}
   CELERY_USE_SENTINEL: ${CELERY_USE_SENTINEL:-false}
   CELERY_SENTINEL_MASTER_NAME: ${CELERY_SENTINEL_MASTER_NAME:-}
+  CELERY_SENTINEL_PASSWORD: ${CELERY_SENTINEL_PASSWORD:-}
   CELERY_SENTINEL_SOCKET_TIMEOUT: ${CELERY_SENTINEL_SOCKET_TIMEOUT:-0.1}
   WEB_API_CORS_ALLOW_ORIGINS: ${WEB_API_CORS_ALLOW_ORIGINS:-*}
   CONSOLE_CORS_ALLOW_ORIGINS: ${CONSOLE_CORS_ALLOW_ORIGINS:-*}