fix(notify): 修复传输生命周期竞态,完善背压与协议边界
- 完善 stream/bulk DataID 分配、预留和双向命名空间,修复并发打开及 dedicated/shared 回退时的 ID 冲突 - 将收发、回复、恢复任务和 sidecar 绑定原始会话与物理连接,防止重连后的旧消息误操作新连接 - 加强 close/reset 身份校验及实例移除检查,修复 dedicated attach 失败、通道引用和资源回收竞态 - 收紧批量发送器停止准入,确保在途入队完成后统一清理请求、缓冲区和等待者 - 修复 record 满队列死锁、取消时序号消耗及关闭竞态,确保关闭有界并返回真实错误 - 增加协商式 record 逻辑半关闭,保留反向 ACK;通过 reset 传递 RecordFailure,避免背压掩盖原始失败原因 - 补齐帧长度、批次数量、序号溢出和未确认窗口校验,提前拒绝超限数据并按字节预算拆批 - 为入站分发增加全局及单连接的条数、字节预算和阻塞背压,关闭时唤醒等待者,消除正常断连日志噪音 - 完善 bulk 窗口释放失败处理与传输诊断,补充并发、重连、背压、协议边界及真实 TCP 回归覆盖
This commit is contained in:
@@ -3,6 +3,7 @@ package notify
|
||||
import (
|
||||
"b612.me/stario"
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"math"
|
||||
"net"
|
||||
@@ -345,6 +346,76 @@ func TestAttachClientSessionTransportRebindsRuntimeAndDispatchesOnNewConn(t *tes
|
||||
}
|
||||
}
|
||||
|
||||
func TestAttachClientSessionTransportRetiresOldRouteTransfersAndSidecars(t *testing.T) {
|
||||
client := NewClient().(*ClientCommon)
|
||||
UseLegacySecurityClient(client)
|
||||
|
||||
stopCtx, stopFn := context.WithCancel(context.Background())
|
||||
defer stopFn()
|
||||
queue := stario.NewQueueCtx(stopCtx, 4, math.MaxUint32)
|
||||
oldLeft, oldRight := net.Pipe()
|
||||
defer oldRight.Close()
|
||||
client.setClientSessionRuntime(newClientSessionRuntime(oldLeft, stopCtx, stopFn, queue, 17))
|
||||
client.markSessionStarted()
|
||||
defer client.markSessionStopped("test done", nil)
|
||||
oldRoute := client.clientSessionRouteSnapshot()
|
||||
|
||||
streamRuntime := client.getStreamRuntime()
|
||||
stream := newStreamHandle(stopCtx, streamRuntime, clientFileScope(), StreamOpenRequest{
|
||||
StreamID: "old-route-stream",
|
||||
DataID: 1,
|
||||
}, oldRoute.epoch, nil, nil, 0, nil, nil, nil, streamRuntime.configSnapshot())
|
||||
stream.setClientSessionRoute(oldRoute)
|
||||
if err := streamRuntime.register(clientFileScope(), stream); err != nil {
|
||||
t.Fatalf("register old-route stream: %v", err)
|
||||
}
|
||||
defer stream.markReset(io.ErrClosedPipe)
|
||||
|
||||
bulkRuntime := client.getBulkRuntime()
|
||||
bulk := newBulkHandle(stopCtx, bulkRuntime, clientFileScope(), BulkOpenRequest{
|
||||
BulkID: "old-route-bulk",
|
||||
DataID: 1,
|
||||
}, oldRoute.epoch, nil, nil, 0, nil, nil, nil, nil, nil)
|
||||
bulk.setClientSessionRoute(oldRoute)
|
||||
if err := bulkRuntime.registerOutbound(clientFileScope(), bulk); err != nil {
|
||||
t.Fatalf("register old-route bulk: %v", err)
|
||||
}
|
||||
defer bulk.markReset(io.ErrClosedPipe)
|
||||
|
||||
sidecarLeft, sidecarRight := net.Pipe()
|
||||
defer sidecarRight.Close()
|
||||
sidecar := newBulkDedicatedSidecar(sidecarLeft, 1)
|
||||
if active, installed := client.installClientDedicatedSidecar(1, sidecar); !installed || active != sidecar {
|
||||
t.Fatalf("install old-route sidecar = %p/%v, want %p/true", active, installed, sidecar)
|
||||
}
|
||||
|
||||
newLeft, newRight := net.Pipe()
|
||||
defer newRight.Close()
|
||||
if err := client.attachClientSessionTransport(newLeft); err != nil {
|
||||
t.Fatalf("attach replacement client transport: %v", err)
|
||||
}
|
||||
|
||||
if err := stream.resetErrSnapshot(); !errors.Is(err, errTransportDetached) {
|
||||
t.Fatalf("old-route stream reset error = %v, want transport detached", err)
|
||||
}
|
||||
if _, ok := streamRuntime.lookup(clientFileScope(), stream.ID()); ok {
|
||||
t.Fatal("old-route stream remained registered after transport reattach")
|
||||
}
|
||||
if err := bulk.resetErrSnapshot(); !errors.Is(err, errTransportDetached) {
|
||||
t.Fatalf("old-route bulk reset error = %v, want transport detached", err)
|
||||
}
|
||||
if _, ok := bulkRuntime.lookup(clientFileScope(), bulk.ID()); ok {
|
||||
t.Fatal("old-route bulk remained registered after transport reattach")
|
||||
}
|
||||
if got := client.clientDedicatedSidecarSnapshotForLane(1); got != nil {
|
||||
t.Fatalf("old-route dedicated sidecar remained installed: %p", got)
|
||||
}
|
||||
_ = sidecarRight.SetReadDeadline(time.Now().Add(time.Second))
|
||||
if _, err := sidecarRight.Read(make([]byte, 1)); err == nil {
|
||||
t.Fatal("old-route dedicated sidecar connection remained open")
|
||||
}
|
||||
}
|
||||
|
||||
func TestSetClientSessionRuntimeStopsOldBindingWorkersOnReattach(t *testing.T) {
|
||||
client := NewClient().(*ClientCommon)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user