From 24c4c2ebf60ec9a4dd7321195360f02933a096ee Mon Sep 17 00:00:00 2001 From: "2569718930@qq.com" <2569718930@qq.com> Date: Tue, 9 Jun 2026 23:26:53 +0800 Subject: [PATCH] Reduce scan startup pressure --- docker-compose.yml | 4 ++-- tests/test_deployment_runtime_config.py | 6 +++--- web/services/scan_terminal_config.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 231c6170..5bbc2af5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -113,8 +113,8 @@ services: POLYWEATHER_OBSERVATION_COLLECTOR_MADIS_SEC: ${POLYWEATHER_OBSERVATION_COLLECTOR_MADIS_SEC:-300} POLYWEATHER_OBSERVATION_COLLECTOR_TICK_SEC: ${POLYWEATHER_OBSERVATION_COLLECTOR_TICK_SEC:-30} POLYWEATHER_SCAN_TERMINAL_BUILD_TIMEOUT_SEC: '30' - POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS: '18' - POLYWEATHER_SCAN_TERMINAL_PREWARM_ENABLED: 'true' + POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS: '8' + POLYWEATHER_SCAN_TERMINAL_PREWARM_ENABLED: 'false' POLYWEATHER_SERVICE_ROLE: web UVICORN_WORKERS: ${UVICORN_WORKERS:-2} healthcheck: diff --git a/tests/test_deployment_runtime_config.py b/tests/test_deployment_runtime_config.py index 3caa248f..c4317fee 100644 --- a/tests/test_deployment_runtime_config.py +++ b/tests/test_deployment_runtime_config.py @@ -91,9 +91,9 @@ def test_docker_compose_isolates_collector_from_web_and_bot_services(): assert "POLYWEATHER_SERVICE_ROLE: bot" in compose assert "POLYWEATHER_SERVICE_ROLE: collector" in collector_block assert "POLYWEATHER_SCAN_TERMINAL_PREWARM_ENABLED: 'false'" in bot_block - assert "POLYWEATHER_SCAN_TERMINAL_PREWARM_ENABLED: 'true'" in web_block + assert "POLYWEATHER_SCAN_TERMINAL_PREWARM_ENABLED: 'false'" in web_block assert "POLYWEATHER_SCAN_TERMINAL_BUILD_TIMEOUT_SEC: '30'" in web_block - assert "POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS: '18'" in web_block + assert "POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS: '8'" in web_block assert "POLYWEATHER_SCAN_TERMINAL_PREWARM_ENABLED: 'false'" in collector_block assert "POLYWEATHER_OBSERVATION_COLLECTOR_ENABLED: 'false'" in bot_block assert "POLYWEATHER_OBSERVATION_COLLECTOR_ENABLED: 'false'" in web_block @@ -126,7 +126,7 @@ def test_scan_terminal_backend_timeout_returns_before_next_proxy_abort(): assert 'POLYWEATHER_SCAN_TERMINAL_PROXY_TIMEOUT_MS || "35000"' in route_source assert '"POLYWEATHER_SCAN_TERMINAL_BUILD_TIMEOUT_SEC",\n 30,' in config_source - assert '"POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS",\n 18,' in config_source + assert '"POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS",\n 8,' in config_source assert ( '"POLYWEATHER_SCAN_TERMINAL_PREWARM_PAYLOAD_TIMEOUT_SEC",\n 30,' in config_source diff --git a/web/services/scan_terminal_config.py b/web/services/scan_terminal_config.py index 713f1662..8560f9ca 100644 --- a/web/services/scan_terminal_config.py +++ b/web/services/scan_terminal_config.py @@ -43,7 +43,7 @@ SCAN_TERMINAL_PREWARM_PAYLOAD_TIMEOUT_SEC = _env_int( ) SCAN_TERMINAL_MAX_WORKERS = _env_int( "POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS", - 18, + 8, min_value=1, - max_value=24, + max_value=12, )