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:
+16
-4
@@ -230,11 +230,15 @@ func sendSignalWithAckTracked(state *signalReliabilityState, scope string, signa
|
||||
}
|
||||
|
||||
func (c *ClientCommon) sendSignalEnvelopeMaybeReliable(env Envelope, msg TransferMsg) error {
|
||||
return c.sendSignalEnvelopeMaybeReliableAtRoute(c.clientSessionRouteSnapshot(), env, msg)
|
||||
}
|
||||
|
||||
func (c *ClientCommon) sendSignalEnvelopeMaybeReliableAtRoute(route clientSessionRoute, env Envelope, msg TransferMsg) error {
|
||||
state := c.getSignalReliabilityState()
|
||||
state.incSignalSend()
|
||||
cfg := c.getSignalReliabilityConfig()
|
||||
if !cfg.Enabled || !signalCanUseTransportAck(msg) {
|
||||
return c.sendEnvelope(env)
|
||||
return c.sendEnvelopeAtRoute(route, env)
|
||||
}
|
||||
state.incReliableSend()
|
||||
return retryReliableSignalSendWithAttempt(cfg, func(cfg signalReliabilityConfig, attempt int) error {
|
||||
@@ -242,7 +246,7 @@ func (c *ClientCommon) sendSignalEnvelopeMaybeReliable(env Envelope, msg Transfe
|
||||
state.incRetry()
|
||||
}
|
||||
return sendSignalWithAckTracked(state, clientFileScope(), env.ID, cfg.AckTimeout, c.getSignalAckPool(), func() error {
|
||||
return c.sendEnvelope(env)
|
||||
return c.sendEnvelopeAtRoute(route, env)
|
||||
})
|
||||
})
|
||||
}
|
||||
@@ -274,7 +278,11 @@ func (s *ServerCommon) sendSignalEnvelopeMaybeReliableTransport(transport *Trans
|
||||
}
|
||||
|
||||
func (c *ClientCommon) sendSignalAck(signalID uint64) error {
|
||||
return c.sendEnvelope(newSignalAckEnvelope(signalID))
|
||||
return c.sendSignalAckAtRoute(c.clientSessionRouteSnapshot(), signalID)
|
||||
}
|
||||
|
||||
func (c *ClientCommon) sendSignalAckAtRoute(route clientSessionRoute, signalID uint64) error {
|
||||
return c.sendEnvelopeAtRoute(route, newSignalAckEnvelope(signalID))
|
||||
}
|
||||
|
||||
func (s *ServerCommon) sendSignalAck(logical *LogicalConn, signalID uint64) error {
|
||||
@@ -311,6 +319,10 @@ func (s *ServerCommon) handleSignalAckEnvelopeTransport(transport *TransportConn
|
||||
}
|
||||
|
||||
func (c *ClientCommon) handleReceivedSignalReliability(msg TransferMsg) bool {
|
||||
return c.handleReceivedSignalReliabilityAtRoute(c.clientSessionRouteSnapshot(), msg)
|
||||
}
|
||||
|
||||
func (c *ClientCommon) handleReceivedSignalReliabilityAtRoute(route clientSessionRoute, msg TransferMsg) bool {
|
||||
cfg := c.getSignalReliabilityConfig()
|
||||
if !cfg.Enabled || !signalCanUseTransportAck(msg) {
|
||||
return false
|
||||
@@ -321,7 +333,7 @@ func (c *ClientCommon) handleReceivedSignalReliability(msg TransferMsg) bool {
|
||||
state.incDuplicateRecv()
|
||||
}
|
||||
state.incAckSend()
|
||||
if err := c.sendSignalAck(msg.ID); err != nil {
|
||||
if err := c.sendSignalAckAtRoute(route, msg.ID); err != nil {
|
||||
state.incAckSendError()
|
||||
if c.showError || c.debugMode {
|
||||
fmt.Println("client send signal ack error", err)
|
||||
|
||||
Reference in New Issue
Block a user