From 772f8d85f5306aeb701a56d739e53b5fecc18aa0 Mon Sep 17 00:00:00 2001 From: "2569718930@qq.com" <2569718930@qq.com> Date: Tue, 9 Jun 2026 22:59:17 +0800 Subject: [PATCH] Increase scan terminal build budget --- docker-compose.yml | 2 ++ tests/test_deployment_runtime_config.py | 5 ++++- web/services/scan_terminal_config.py | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c6b90153..231c6170 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,6 +112,8 @@ services: POLYWEATHER_OBSERVATION_COLLECTOR_INITIAL_DELAY_SEC: ${POLYWEATHER_OBSERVATION_COLLECTOR_INITIAL_DELAY_SEC:-5} 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_SERVICE_ROLE: web UVICORN_WORKERS: ${UVICORN_WORKERS:-2} diff --git a/tests/test_deployment_runtime_config.py b/tests/test_deployment_runtime_config.py index 946c6daa..3caa248f 100644 --- a/tests/test_deployment_runtime_config.py +++ b/tests/test_deployment_runtime_config.py @@ -92,6 +92,8 @@ def test_docker_compose_isolates_collector_from_web_and_bot_services(): 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_BUILD_TIMEOUT_SEC: '30'" in web_block + assert "POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS: '18'" 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 @@ -123,7 +125,8 @@ def test_scan_terminal_backend_timeout_returns_before_next_proxy_abort(): ).read_text(encoding="utf-8") assert 'POLYWEATHER_SCAN_TERMINAL_PROXY_TIMEOUT_MS || "35000"' in route_source - assert '"POLYWEATHER_SCAN_TERMINAL_BUILD_TIMEOUT_SEC",\n 10,' in config_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_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 9a7ac97d..713f1662 100644 --- a/web/services/scan_terminal_config.py +++ b/web/services/scan_terminal_config.py @@ -31,7 +31,7 @@ SCAN_TERMINAL_PAYLOAD_TTL_SEC = min( ) SCAN_TERMINAL_BUILD_TIMEOUT_SEC = _env_int( "POLYWEATHER_SCAN_TERMINAL_BUILD_TIMEOUT_SEC", - 10, + 30, min_value=8, max_value=30, ) @@ -43,7 +43,7 @@ SCAN_TERMINAL_PREWARM_PAYLOAD_TIMEOUT_SEC = _env_int( ) SCAN_TERMINAL_MAX_WORKERS = _env_int( "POLYWEATHER_SCAN_TERMINAL_MAX_WORKERS", - 8, + 18, min_value=1, - max_value=12, + max_value=24, )