From f5aa50a68b7f969cf6e3a146d5f403403e1a321d Mon Sep 17 00:00:00 2001 From: Linghong Date: Fri, 10 Jul 2026 08:31:04 +0000 Subject: [PATCH] =?UTF-8?q?BgFilter=20=E7=94=9F=E4=BA=A7=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=20180s=EF=BC=8C=E4=B8=8E=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=BB=98=E8=AE=A4=E5=80=BC/=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 代码默认已改 180s（14a5cde9d，适配 2K 图），但 env.example 与 deploy/provision 脚本仍写 45000，会被注入生产 env 覆盖默认值，2K BgFilter 仍可能超时。 - 两份 api-server.env.example: 45000 -> 180000 - deploy/provision 脚本改用 ensure_env_value_migrates_old_default， 把存量机器的旧默认 45000 迁移到 180000（key 缺失则直接写 180000） Co-Authored-By: Claude Opus 4.8 --- deploy/container/api-server.env.example | 2 +- deploy/env/api-server.env.example | 2 +- scripts/deploy/production-api-deploy.sh | 2 +- scripts/jenkins-server-provision.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/container/api-server.env.example b/deploy/container/api-server.env.example index e0f28bdbf..73f13ca29 100644 --- a/deploy/container/api-server.env.example +++ b/deploy/container/api-server.env.example @@ -32,7 +32,7 @@ GENARRATIVE_WALLET_REFUND_OUTBOX_DIR=/var/lib/genarrative/wallet-refund-outbox GENARRATIVE_WALLET_REFUND_OUTBOX_BATCH_SIZE=100 GENARRATIVE_WALLET_REFUND_OUTBOX_FLUSH_INTERVAL_MS=1000 GENARRATIVE_WALLET_REFUND_OUTBOX_MAX_BYTES=67108864 -GENARRATIVE_EDITOR_BGFILTER_REQUEST_TIMEOUT_MS=45000 +GENARRATIVE_EDITOR_BGFILTER_REQUEST_TIMEOUT_MS=180000 GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_FAILURE_THRESHOLD=3 GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_COOLDOWN_SECONDS=300 diff --git a/deploy/env/api-server.env.example b/deploy/env/api-server.env.example index cbf014f0c..4d3d9dee8 100644 --- a/deploy/env/api-server.env.example +++ b/deploy/env/api-server.env.example @@ -32,7 +32,7 @@ GENARRATIVE_WALLET_REFUND_OUTBOX_DIR=/var/lib/genarrative/wallet-refund-outbox GENARRATIVE_WALLET_REFUND_OUTBOX_BATCH_SIZE=100 GENARRATIVE_WALLET_REFUND_OUTBOX_FLUSH_INTERVAL_MS=1000 GENARRATIVE_WALLET_REFUND_OUTBOX_MAX_BYTES=67108864 -GENARRATIVE_EDITOR_BGFILTER_REQUEST_TIMEOUT_MS=45000 +GENARRATIVE_EDITOR_BGFILTER_REQUEST_TIMEOUT_MS=180000 GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_FAILURE_THRESHOLD=3 GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_COOLDOWN_SECONDS=300 GENARRATIVE_OTEL_ENABLED=true diff --git a/scripts/deploy/production-api-deploy.sh b/scripts/deploy/production-api-deploy.sh index d541e5d0e..a9654c221 100644 --- a/scripts/deploy/production-api-deploy.sh +++ b/scripts/deploy/production-api-deploy.sh @@ -255,7 +255,7 @@ ensure_runtime_env_and_dirs() { ensure_env_value_migrates_old_default "${api_env_file}" "GENARRATIVE_EXTERNAL_GENERATION_WORKER_LEASE_SECONDS" "3600" "600" ensure_env_value "${api_env_file}" "GENARRATIVE_EXTERNAL_GENERATION_WORKER_JOB_TIMEOUT_SECONDS" "900" ensure_env_value "${api_env_file}" "GENARRATIVE_EXTERNAL_GENERATION_WORKER_LONG_JOB_TIMEOUT_SECONDS" "1800" - ensure_env_value "${api_env_file}" "GENARRATIVE_EDITOR_BGFILTER_REQUEST_TIMEOUT_MS" "45000" + ensure_env_value_migrates_old_default "${api_env_file}" "GENARRATIVE_EDITOR_BGFILTER_REQUEST_TIMEOUT_MS" "45000" "180000" ensure_env_value "${api_env_file}" "GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_FAILURE_THRESHOLD" "3" ensure_env_value "${api_env_file}" "GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_COOLDOWN_SECONDS" "300" diff --git a/scripts/jenkins-server-provision.sh b/scripts/jenkins-server-provision.sh index edea458aa..2145bf803 100755 --- a/scripts/jenkins-server-provision.sh +++ b/scripts/jenkins-server-provision.sh @@ -479,7 +479,7 @@ ensure_api_runtime_env_defaults() { ensure_env_value_migrates_old_default "${API_ENV_FILE}" "GENARRATIVE_EXTERNAL_GENERATION_WORKER_LEASE_SECONDS" "3600" "600" ensure_env_value "${API_ENV_FILE}" "GENARRATIVE_EXTERNAL_GENERATION_WORKER_JOB_TIMEOUT_SECONDS" "900" ensure_env_value "${API_ENV_FILE}" "GENARRATIVE_EXTERNAL_GENERATION_WORKER_LONG_JOB_TIMEOUT_SECONDS" "1800" - ensure_env_value "${API_ENV_FILE}" "GENARRATIVE_EDITOR_BGFILTER_REQUEST_TIMEOUT_MS" "45000" + ensure_env_value_migrates_old_default "${API_ENV_FILE}" "GENARRATIVE_EDITOR_BGFILTER_REQUEST_TIMEOUT_MS" "45000" "180000" ensure_env_value "${API_ENV_FILE}" "GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_FAILURE_THRESHOLD" "3" ensure_env_value "${API_ENV_FILE}" "GENARRATIVE_EDITOR_BGFILTER_CIRCUIT_COOLDOWN_SECONDS" "300" }