From 0bc4c005817be9f3f11adc0251de40433e4510e3 Mon Sep 17 00:00:00 2001 From: wangbo Date: Fri, 31 Jul 2026 19:20:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(acceptance):=20=E5=9B=BA=E5=AE=9A=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E8=8A=82=E7=82=B9=E4=BA=A4=E6=8D=A2=E5=86=85=E5=AD=98?= =?UTF-8?q?=E4=B8=8A=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 设置 K3d 节点资源限制时同步更新 memory 与 memory-swap，避免 Docker 因既有 swap 上限较低而拒绝节点内存预算，并禁止验收节点依赖额外交换空间。\n\n验证：bash -n scripts/acceptance/local-cluster.sh；shellcheck scripts/acceptance/local-cluster.sh --- scripts/acceptance/local-cluster.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/acceptance/local-cluster.sh b/scripts/acceptance/local-cluster.sh index c3a4b3a..ac22726 100755 --- a/scripts/acceptance/local-cluster.sh +++ b/scripts/acceptance/local-cluster.sh @@ -458,9 +458,9 @@ up_cluster() { config="$state_root/k3d.rendered.yaml" render_k3d_config "$config" EASYAI_ACCEPTANCE_MEDIA_DIR="$media_root" "$k3d" cluster create --config "$config" - docker update --cpus 4 --memory 8g "k3d-${cluster_name}-server-0" >/dev/null - docker update --cpus 4 --memory 8g "k3d-${cluster_name}-server-1" >/dev/null - docker update --cpus 2 --memory 4g "k3d-${cluster_name}-server-2" >/dev/null + docker update --cpus 4 --memory 8g --memory-swap 8g "k3d-${cluster_name}-server-0" >/dev/null + docker update --cpus 4 --memory 8g --memory-swap 8g "k3d-${cluster_name}-server-1" >/dev/null + docker update --cpus 2 --memory 4g --memory-swap 4g "k3d-${cluster_name}-server-2" >/dev/null "$k3d" image import -c "$cluster_name" "$api_image" "$web_image" "$netem_image" local cnpg_manifest="$state_root/cnpg.yaml"