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:
+57
-53
@@ -17,38 +17,7 @@ func (s *ServerCommon) OpenStreamLogical(ctx context.Context, logical *LogicalCo
|
||||
if logical == nil {
|
||||
return nil, errStreamLogicalConnNil
|
||||
}
|
||||
runtime := s.getStreamRuntime()
|
||||
if runtime == nil {
|
||||
return nil, errStreamRuntimeNil
|
||||
}
|
||||
req := serverStreamRequest(runtime, opt)
|
||||
scope := serverFileScope(logical)
|
||||
if _, exists := runtime.lookup(scope, req.StreamID); exists {
|
||||
return nil, errStreamAlreadyExists
|
||||
}
|
||||
resp, err := sendStreamOpenServerLogical(ctx, s, logical, req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if resp.DataID != 0 {
|
||||
req.DataID = resp.DataID
|
||||
}
|
||||
if resp.FastPathVersion != 0 {
|
||||
req.FastPathVersion = resp.FastPathVersion
|
||||
} else {
|
||||
req.FastPathVersion = streamFastPathVersionV1
|
||||
}
|
||||
req.Metadata = mergeStreamMetadata(req.Metadata, resp.Metadata)
|
||||
transport := logical.CurrentTransportConn()
|
||||
stream := newStreamHandle(logical.stopContextSnapshot(), runtime, scope, req, 0, logical, transport, resp.TransportGeneration, serverStreamCloseSender(s, logical, nil), serverStreamResetSender(s, logical, nil), serverStreamDataSender(s, transport), runtime.configSnapshot())
|
||||
if err := runtime.register(scope, stream); err != nil {
|
||||
_, _ = sendStreamResetServerLogical(context.Background(), s, logical, StreamResetRequest{
|
||||
StreamID: req.StreamID,
|
||||
Error: err.Error(),
|
||||
})
|
||||
return nil, err
|
||||
}
|
||||
return stream, nil
|
||||
return s.openStreamTransport(ctx, logical.CurrentTransportConn(), opt)
|
||||
}
|
||||
|
||||
func (s *ServerCommon) OpenStreamTransport(ctx context.Context, transport *TransportConn, opt StreamOpenOptions) (Stream, error) {
|
||||
@@ -58,6 +27,19 @@ func (s *ServerCommon) OpenStreamTransport(ctx context.Context, transport *Trans
|
||||
if transport == nil {
|
||||
return nil, errStreamTransportNil
|
||||
}
|
||||
return s.openStreamTransport(ctx, transport, opt)
|
||||
}
|
||||
|
||||
func (s *ServerCommon) openStreamTransport(ctx context.Context, transport *TransportConn, opt StreamOpenOptions) (Stream, error) {
|
||||
if s == nil {
|
||||
return nil, errStreamServerNil
|
||||
}
|
||||
if transport == nil {
|
||||
return nil, errStreamTransportNil
|
||||
}
|
||||
if err := s.ensureServerTransportSendReady(transport); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
logical := transport.LogicalConn()
|
||||
if logical == nil {
|
||||
return nil, errStreamLogicalConnNil
|
||||
@@ -71,26 +53,36 @@ func (s *ServerCommon) OpenStreamTransport(ctx context.Context, transport *Trans
|
||||
if _, exists := runtime.lookup(scope, req.StreamID); exists {
|
||||
return nil, errStreamAlreadyExists
|
||||
}
|
||||
resp, err := sendStreamOpenServerTransport(ctx, s, transport, req)
|
||||
dataID, err := runtime.reserveDataID(scope)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if resp.DataID != 0 {
|
||||
req.DataID = resp.DataID
|
||||
req.DataID = dataID
|
||||
stream := newStreamHandle(logical.stopContextSnapshot(), runtime, scope, req, 0, logical, transport, transport.TransportGeneration(), serverStreamCloseSender(s, logical, transport), serverStreamResetSender(s, logical, transport), serverStreamDataSender(s, transport), runtime.configSnapshot())
|
||||
if err := runtime.adoptReserved(scope, stream); err != nil {
|
||||
runtime.releaseDataID(scope, req.DataID)
|
||||
return nil, err
|
||||
}
|
||||
resp, err := sendStreamOpenServerTransport(ctx, s, transport, req)
|
||||
if err != nil {
|
||||
s.bestEffortStreamResetTransport(transport, StreamResetRequest{StreamID: req.StreamID, DataID: req.DataID, Error: err.Error()})
|
||||
stream.markReset(err)
|
||||
return nil, err
|
||||
}
|
||||
if resp.DataID != 0 && resp.DataID != req.DataID {
|
||||
err = errStreamAlreadyExists
|
||||
s.bestEffortStreamResetTransport(transport, StreamResetRequest{StreamID: req.StreamID, Error: "stream data id mismatch"})
|
||||
stream.markReset(err)
|
||||
return nil, err
|
||||
}
|
||||
if resp.FastPathVersion != 0 {
|
||||
req.FastPathVersion = resp.FastPathVersion
|
||||
stream.setFastPathVersion(resp.FastPathVersion)
|
||||
} else {
|
||||
req.FastPathVersion = streamFastPathVersionV1
|
||||
stream.setFastPathVersion(streamFastPathVersionV1)
|
||||
}
|
||||
req.Metadata = mergeStreamMetadata(req.Metadata, resp.Metadata)
|
||||
stream := newStreamHandle(logical.stopContextSnapshot(), runtime, scope, req, 0, logical, transport, resp.TransportGeneration, serverStreamCloseSender(s, logical, transport), serverStreamResetSender(s, logical, transport), serverStreamDataSender(s, transport), runtime.configSnapshot())
|
||||
if err := runtime.register(scope, stream); err != nil {
|
||||
_, _ = sendStreamResetServerTransport(context.Background(), s, transport, StreamResetRequest{
|
||||
StreamID: req.StreamID,
|
||||
Error: err.Error(),
|
||||
})
|
||||
return nil, err
|
||||
stream.metadata = mergeStreamMetadata(req.Metadata, resp.Metadata)
|
||||
if resp.TransportGeneration != 0 {
|
||||
stream.setTransportGeneration(resp.TransportGeneration)
|
||||
}
|
||||
return stream, nil
|
||||
}
|
||||
@@ -114,13 +106,14 @@ func serverStreamCloseSender(s *ServerCommon, logical *LogicalConn, transport *T
|
||||
return func(ctx context.Context, stream *streamHandle, full bool) error {
|
||||
req := StreamCloseRequest{
|
||||
StreamID: stream.ID(),
|
||||
DataID: stream.dataIDSnapshot(),
|
||||
Full: full,
|
||||
}
|
||||
if logical != nil {
|
||||
_, err := sendStreamCloseServerLogical(ctx, s, logical, req)
|
||||
if transport != nil {
|
||||
_, err := sendStreamCloseServerTransport(ctx, s, transport, req)
|
||||
return err
|
||||
}
|
||||
_, err := sendStreamCloseServerTransport(ctx, s, transport, req)
|
||||
_, err := sendStreamCloseServerLogical(ctx, s, logical, req)
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -128,18 +121,29 @@ func serverStreamCloseSender(s *ServerCommon, logical *LogicalConn, transport *T
|
||||
func serverStreamResetSender(s *ServerCommon, logical *LogicalConn, transport *TransportConn) streamResetSender {
|
||||
return func(ctx context.Context, stream *streamHandle, message string) error {
|
||||
req := StreamResetRequest{
|
||||
StreamID: stream.ID(),
|
||||
Error: message,
|
||||
StreamID: stream.ID(),
|
||||
DataID: stream.dataIDSnapshot(),
|
||||
Error: message,
|
||||
RecordFailure: stream.recordResetFailure(),
|
||||
}
|
||||
if logical != nil {
|
||||
_, err := sendStreamResetServerLogical(ctx, s, logical, req)
|
||||
if transport != nil {
|
||||
_, err := sendStreamResetServerTransport(ctx, s, transport, req)
|
||||
return err
|
||||
}
|
||||
_, err := sendStreamResetServerTransport(ctx, s, transport, req)
|
||||
_, err := sendStreamResetServerLogical(ctx, s, logical, req)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
func (s *ServerCommon) bestEffortStreamResetTransport(transport *TransportConn, req StreamResetRequest) {
|
||||
if s == nil || transport == nil {
|
||||
return
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(context.Background(), streamDispatchRejectTimeout)
|
||||
defer cancel()
|
||||
_, _ = sendStreamResetServerTransport(ctx, s, transport, req)
|
||||
}
|
||||
|
||||
func serverStreamDataSender(s *ServerCommon, transport *TransportConn) streamDataSender {
|
||||
return func(ctx context.Context, stream *streamHandle, chunk []byte) error {
|
||||
if s == nil {
|
||||
|
||||
Reference in New Issue
Block a user