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:
2026-09-23 15:33:17 +08:00
parent 0826e17063
commit 1f2e74acca
79 changed files with 9190 additions and 1013 deletions
+40 -10
View File
@@ -12,10 +12,21 @@ import (
const streamDispatchRejectTimeout = 300 * time.Millisecond
func (c *ClientCommon) dispatchStreamEnvelope(env Envelope) {
route := c.clientSessionRouteSnapshot()
if route.epoch == 0 {
route.epoch = c.currentClientSessionEpoch()
}
c.dispatchStreamEnvelopeAtRoute(route, env)
}
func (c *ClientCommon) dispatchStreamEnvelopeAtRoute(route clientSessionRoute, env Envelope) {
streamID := env.Stream.StreamID
if streamID == "" {
return
}
if route.binding != nil && !c.clientSessionRouteCurrent(route) {
return
}
runtime := c.getStreamRuntime()
if runtime == nil {
return
@@ -25,16 +36,16 @@ func (c *ClientCommon) dispatchStreamEnvelope(env Envelope) {
if c.showError || c.debugMode {
fmt.Println("client stream data for unknown stream", streamID)
}
c.bestEffortRejectInboundStreamData(streamID, 0, errStreamNotFound.Error())
c.bestEffortRejectInboundStreamDataAtRoute(route, streamID, 0, errStreamNotFound.Error())
return
}
if !stream.acceptsClientSessionEpoch(c.currentClientSessionEpoch()) {
if !stream.acceptsClientSessionRoute(route) {
if c.showError || c.debugMode {
fmt.Println("client stream data rejected by stale session epoch", streamID)
}
detachErr := transportDetachedSessionEpochError()
stream.markReset(detachErr)
c.bestEffortRejectInboundStreamData(streamID, stream.dataIDSnapshot(), detachErr.Error())
c.bestEffortRejectInboundStreamDataAtRoute(route, streamID, stream.dataIDSnapshot(), detachErr.Error())
return
}
if err := stream.pushChunk(env.Stream.Chunk); err != nil {
@@ -42,7 +53,7 @@ func (c *ClientCommon) dispatchStreamEnvelope(env Envelope) {
fmt.Println("client stream push chunk error", err)
}
if !errors.Is(err, io.EOF) {
c.bestEffortRejectInboundStreamData(streamID, stream.dataIDSnapshot(), err.Error())
c.bestEffortRejectInboundStreamDataAtRoute(route, streamID, stream.dataIDSnapshot(), err.Error())
}
}
}
@@ -83,13 +94,28 @@ func (s *ServerCommon) dispatchStreamEnvelope(logical *LogicalConn, transport *T
}
func (c *ClientCommon) dispatchFastStreamData(frame streamFastDataFrame) {
c.dispatchFastStreamDataWithOwner(frame, nil)
route := c.clientSessionRouteSnapshot()
if route.epoch == 0 {
route.epoch = c.currentClientSessionEpoch()
}
c.dispatchFastStreamDataWithOwnerAtRoute(route, frame, nil)
}
func (c *ClientCommon) dispatchFastStreamDataWithOwner(frame streamFastDataFrame, owner *streamReadPayloadOwner) {
route := c.clientSessionRouteSnapshot()
if route.epoch == 0 {
route.epoch = c.currentClientSessionEpoch()
}
c.dispatchFastStreamDataWithOwnerAtRoute(route, frame, owner)
}
func (c *ClientCommon) dispatchFastStreamDataWithOwnerAtRoute(route clientSessionRoute, frame streamFastDataFrame, owner *streamReadPayloadOwner) {
if frame.DataID == 0 {
return
}
if route.binding != nil && !c.clientSessionRouteCurrent(route) {
return
}
runtime := c.getStreamRuntime()
if runtime == nil {
return
@@ -99,16 +125,16 @@ func (c *ClientCommon) dispatchFastStreamDataWithOwner(frame streamFastDataFrame
if c.showError || c.debugMode {
fmt.Println("client stream data for unknown data id", frame.DataID)
}
c.bestEffortRejectInboundStreamData("", frame.DataID, errStreamNotFound.Error())
c.bestEffortRejectInboundStreamDataAtRoute(route, "", frame.DataID, errStreamNotFound.Error())
return
}
if !stream.acceptsClientSessionEpoch(c.currentClientSessionEpoch()) {
if !stream.acceptsClientSessionRoute(route) {
if c.showError || c.debugMode {
fmt.Println("client stream data rejected by stale session epoch", frame.DataID)
}
detachErr := transportDetachedSessionEpochError()
stream.markReset(detachErr)
c.bestEffortRejectInboundStreamData(stream.ID(), frame.DataID, detachErr.Error())
c.bestEffortRejectInboundStreamDataAtRoute(route, stream.ID(), frame.DataID, detachErr.Error())
return
}
var err error
@@ -122,7 +148,7 @@ func (c *ClientCommon) dispatchFastStreamDataWithOwner(frame streamFastDataFrame
fmt.Println("client stream push chunk error", err)
}
if !errors.Is(err, io.EOF) {
c.bestEffortRejectInboundStreamData(stream.ID(), frame.DataID, err.Error())
c.bestEffortRejectInboundStreamDataAtRoute(route, stream.ID(), frame.DataID, err.Error())
}
}
}
@@ -172,12 +198,16 @@ func (s *ServerCommon) dispatchFastStreamDataWithOwner(logical *LogicalConn, tra
}
func (c *ClientCommon) bestEffortRejectInboundStreamData(streamID string, dataID uint64, message string) {
c.bestEffortRejectInboundStreamDataAtRoute(c.clientSessionRouteSnapshot(), streamID, dataID, message)
}
func (c *ClientCommon) bestEffortRejectInboundStreamDataAtRoute(route clientSessionRoute, streamID string, dataID uint64, message string) {
if c == nil || (streamID == "" && dataID == 0) {
return
}
ctx, cancel := context.WithTimeout(context.Background(), streamDispatchRejectTimeout)
defer cancel()
_, _ = sendStreamResetClient(ctx, c, StreamResetRequest{
_, _ = sendStreamResetClientAtRoute(ctx, c, route, StreamResetRequest{
StreamID: streamID,
DataID: dataID,
Error: message,