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:
+13
-2
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"net"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
@@ -18,6 +19,7 @@ type LogicalConn struct {
|
||||
transportState atomic.Pointer[clientConnTransportState]
|
||||
attachment atomic.Pointer[clientConnAttachmentState]
|
||||
inboundTransitionProfile atomic.Pointer[transportProtectionProfile]
|
||||
transportLifecycleMu sync.Mutex
|
||||
}
|
||||
|
||||
var errLogicalConnClientNil = errors.New("logical conn is nil")
|
||||
@@ -1118,15 +1120,23 @@ func (c *LogicalConn) transportConnSnapshotForInbound(conn net.Conn, remoteAddr
|
||||
}
|
||||
|
||||
attached := false
|
||||
var binding *transportBinding
|
||||
currentGeneration := c.transportGenerationSnapshot()
|
||||
if conn != nil {
|
||||
binding := c.transportBindingSnapshot()
|
||||
if binding != nil && binding.connSnapshot() == conn && c.transportAttachedSnapshot() && currentGeneration == generation {
|
||||
currentBinding := c.transportBindingSnapshot()
|
||||
if currentBinding != nil && currentBinding.connSnapshot() == conn && c.transportAttachedSnapshot() && currentGeneration == generation {
|
||||
binding = currentBinding
|
||||
attached = true
|
||||
} else {
|
||||
// Keep stale inbound replies on the socket that delivered them. This
|
||||
// binding intentionally has no queue/sender state and is never used
|
||||
// by a logical send after IsCurrent rejects the old generation.
|
||||
binding = newTransportBinding(conn, nil)
|
||||
}
|
||||
} else {
|
||||
current := c.CurrentTransportConn()
|
||||
if current != nil && currentGeneration == generation && transportConnAddrString(current.RemoteAddr()) == transportConnAddrString(remoteAddr) {
|
||||
binding = current.binding
|
||||
attached = current.Attached()
|
||||
if !hasRuntimeConn {
|
||||
hasRuntimeConn = current.HasRuntimeConn()
|
||||
@@ -1138,6 +1148,7 @@ func (c *LogicalConn) transportConnSnapshotForInbound(conn net.Conn, remoteAddr
|
||||
logical: c,
|
||||
generation: generation,
|
||||
remoteAddr: remoteAddr,
|
||||
binding: binding,
|
||||
attached: attached,
|
||||
hasRuntimeConn: hasRuntimeConn,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user