From c9fbf6e6f6ee17cbfaa3f95f30a1752173a96353 Mon Sep 17 00:00:00 2001
From: wangbo <wangbolhr@163.com>
Date: Sat, 1 Aug 2026 11:38:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(cluster):=20=E7=A8=B3=E5=AE=9A=20Worker=20?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=A6=96=E6=AC=A1=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在新增 WireGuard 对等后等待全部握手并预热双向路由，再执行严格 10 包链路门禁；K3s 安装器检测到既有 unit 时显式启动未运行的 agent，并补充 Worker 标签校验。\n\n验证：bash -n、ShellCheck、四节点六向链路复测、K3s agent Ready 与隔离状态逐项核对。
---
 scripts/cluster/add-worker-node.sh | 31 +++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/scripts/cluster/add-worker-node.sh b/scripts/cluster/add-worker-node.sh
index 89b7cdf..b41f559 100755
--- a/scripts/cluster/add-worker-node.sh
+++ b/scripts/cluster/add-worker-node.sh
@@ -151,10 +151,36 @@ REMOTE
       "$node_ip" "$worker_wireguard_port" <<'REMOTE'
 set -euo pipefail
 wg set wg0 peer "$1" allowed-ips "$3/32" endpoint "$2:$4" persistent-keepalive 25
-wg-quick save wg0
+wg-quick save wg0 >/dev/null
 REMOTE
   done
 
+  local handshakes_ready=false recent
+  for _ in $(seq 1 30); do
+    handshakes_ready=true
+    for host in "${server_hosts[@]}" "$CLUSTER_WORKER_NODE_4_HOST"; do
+      recent=$(cluster_ssh "$host" \
+        "wg show wg0 latest-handshakes | awk '\$2 > 0 && systime()-\$2 < 180 {count++} END {print count+0}'")
+      if [[ $recent != 3 ]]; then
+        handshakes_ready=false
+        break
+      fi
+    done
+    [[ $handshakes_ready == true ]] && break
+    sleep 2
+  done
+  [[ $handshakes_ready == true ]] || {
+    echo 'Worker node WireGuard peers did not complete their initial handshakes within 60 seconds' >&2
+    return 1
+  }
+  # Prime both directions after the new peer endpoint is installed. These packets are not
+  # part of the measured 10-packet gate and only establish routes/NAT state.
+  cluster_ssh "$CLUSTER_NINGBO_HOST" "ping -q -c 3 -W 2 $node_ip >/dev/null" || true
+  cluster_ssh "$CLUSTER_WORKER_NODE_4_HOST" 'ping -q -c 3 -W 2 10.77.0.1 >/dev/null' || true
+  cluster_ssh "$CLUSTER_HONGKONG_HOST" "ping -q -c 3 -W 2 $node_ip >/dev/null" || true
+  cluster_ssh "$CLUSTER_WORKER_NODE_4_HOST" 'ping -q -c 3 -W 2 10.77.0.2 >/dev/null' || true
+  cluster_ssh "$CLUSTER_LOS_ANGELES_HOST" "ping -q -c 3 -W 2 $node_ip >/dev/null" || true
+  cluster_ssh "$CLUSTER_WORKER_NODE_4_HOST" 'ping -q -c 3 -W 2 10.77.0.3 >/dev/null' || true
   verify_wireguard
 }
 
@@ -240,6 +266,8 @@ curl -fsSL https://get.k3s.io -o "$install_script"
 chmod 0700 "$install_script"
 INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_VERSION="$version" \
   INSTALL_K3S_EXEC=agent "$install_script"
+systemctl enable k3s-agent >/dev/null
+systemctl is-active --quiet k3s-agent || systemctl start k3s-agent
 systemctl is-active --quiet k3s-agent
 systemctl is-enabled --quiet k3s-agent
 [[ ! -e /var/lib/rancher/k3s/server/db/etcd ]]
@@ -276,6 +304,7 @@ kubectl='k3s kubectl'
 [[ $($kubectl get node "$node" -o jsonpath='{.metadata.labels.easyai\.io/site}') == "$site" ]]
 [[ $($kubectl get node "$node" -o jsonpath='{.metadata.labels.easyai\.io/workload}') == true ]]
 [[ $($kubectl get node "$node" -o jsonpath='{.metadata.labels.easyai\.io/database}') == false ]]
+[[ $($kubectl get node "$node" -o jsonpath='{.metadata.labels.easyai\.io/worker}') == true ]]
 [[ $($kubectl get node easyai-hongkong -o jsonpath='{.metadata.labels.easyai\.io/worker}') == true ]]
 [[ $($kubectl get node easyai-ningbo -o jsonpath='{.metadata.labels.easyai\.io/worker}') == false ]]
 [[ $($kubectl get node "$node" -o json | jq '[.spec.taints[]? | select(.key=="easyai.io/worker-only" and .effect=="NoSchedule")] | length') -eq 1 ]]