From 7696f29fb3c5ce81cd74ed5015a11df06141a29a Mon Sep 17 00:00:00 2001 From: yuyr Date: Mon, 13 Oct 2025 16:15:07 +0800 Subject: [PATCH] =?UTF-8?q?[#13]=20ES=E5=8A=A0=E5=A4=A7=E7=A3=81=E7=9B=98?= =?UTF-8?q?=E6=B0=B4=E4=BD=8D=E5=BA=94=E5=AF=B9lm2=E6=9C=BA=E5=99=A8?= =?UTF-8?q?=E7=A3=81=E7=9B=98=E7=B4=A7=E5=BC=A0=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sys/debug/README.md | 1 + src/sys/debug/scripts/03_wait_ready.sh | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/sys/debug/README.md b/src/sys/debug/README.md index 2466b63..cebfaa4 100644 --- a/src/sys/debug/README.md +++ b/src/sys/debug/README.md @@ -57,6 +57,7 @@ cd src/sys/debug - `scripts/network-create.sh` / `network-destroy.sh`:管理 external 网络。 - `scripts/00_debug_all.sh`:顺序执行 01~08(默认不执行 09)。 - `scripts/clean-data.sh`:选择性清理宿主机私有数据。 +- `scripts/03_wait_ready.sh`:除了等待各服务就绪,还会在 Elasticsearch 就绪后自动将磁盘水位阈值放宽(97%/98%/99%),避免在磁盘紧张的调试环境中分片分配失败。 - `scripts/08_restart_agent_reregister.sh`:将 node-b 切换到 `SYS_DEBUG_NODEB_FIXED_IP`(默认 `172.30.0.200`),如果目标地址与当前 IP 相同脚本会报错提醒重新选择地址。 - 其它 `01~09` 与测试目录对应,但针对参数化路径及网络做了调整。 diff --git a/src/sys/debug/scripts/03_wait_ready.sh b/src/sys/debug/scripts/03_wait_ready.sh index a92411c..0525b51 100755 --- a/src/sys/debug/scripts/03_wait_ready.sh +++ b/src/sys/debug/scripts/03_wait_ready.sh @@ -41,6 +41,17 @@ if (( attempt > max )); then exit 1 fi +log "Applying relaxed ES disk watermarks for debug" +curl -fsS -XPUT "http://localhost:9200/_cluster/settings" \ + -H 'Content-Type: application/json' \ + -d '{ + "transient": { + "cluster.routing.allocation.disk.watermark.low": "97%", + "cluster.routing.allocation.disk.watermark.high": "98%", + "cluster.routing.allocation.disk.watermark.flood_stage": "99%" + } + }' >/dev/null || echo "[WARN] Failed to adjust ES watermarks" + log "Waiting for Kibana to be available (HTTP 200)" kb_attempt=1; kb_max=180 while (( kb_attempt <= kb_max )); do