fix(agent): agent↔目标段补 5s TCP keepalive——目标假死(进程在但不响应/不发FIN)是全链路最后一段无存活检测的缺口, 观看端会无限挂死画面; 附目标端→观看端断开同步 e2e(回显即关目标, 观看端 0.01s 同步断开)

This commit is contained in:
w11
2026-09-25 01:33:31 +08:00
parent 7a0ec8ded9
commit 560a641809
2 changed files with 68 additions and 0 deletions
+61
View File
@@ -8,6 +8,7 @@ package e2e
import (
"errors"
"fmt"
"io"
"net"
"strconv"
"testing"
@@ -134,3 +135,63 @@ func TestAgentDialTimeoutCutsViewer(t *testing.T) {
assertViewerCutBy(t, port, 3*time.Second)
}
// startCloseAfterEchoServer 回显一段即关闭的目标:模拟 tvnserver 进程退出。
func startCloseAfterEchoServer(t *testing.T) string {
t.Helper()
l, err := net.Listen("tcp", "127.0.0.1:0")
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { l.Close() })
go func() {
for {
c, err := l.Accept()
if err != nil {
return
}
go func(c net.Conn) {
defer c.Close()
buf := make([]byte, 512)
n, _ := c.Read(buf)
if n > 0 {
c.Write(buf[:n]) // 回显一次随即断开
}
}(c)
}
}()
return l.Addr().String()
}
// TestTargetCloseCutsViewer 目标端→观看端断开同步:目标(如 tvnserver)关闭后,
// 观看端必须在时限内被同步断开, 不允许残留悬挂连接。
func TestTargetCloseCutsViewer(t *testing.T) {
n, a := startEnv(t)
target := startCloseAfterEchoServer(t)
_, port := mustRegister(t, n, a, target)
viewer, err := net.DialTimeout("tcp", net.JoinHostPort("127.0.0.1", strconv.Itoa(port)), 2*time.Second)
if err != nil {
t.Fatal(err)
}
defer viewer.Close()
_ = viewer.SetDeadline(time.Now().Add(3 * time.Second))
payload := []byte("probe")
if _, err := viewer.Write(payload); err != nil {
t.Fatal(err)
}
got := make([]byte, len(payload))
if _, err := io.ReadFull(viewer, got); err != nil {
t.Fatal(err)
}
// 回显已到, 目标随即关闭 → 观看端应读到 EOF/重置(而非超时)
buf := make([]byte, 16)
_, err = viewer.Read(buf)
if err == nil {
t.Fatal("目标已关闭, 观看端却读到数据")
}
var netErr net.Error
if errors.As(err, &netErr) && netErr.Timeout() {
t.Fatal("目标关闭 3s 内未同步断开观看端")
}
}