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:
@@ -6,7 +6,9 @@ import (
|
||||
"errors"
|
||||
"math"
|
||||
"net"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
@@ -133,6 +135,72 @@ func TestBulkReadDoesNotBlockOnAsyncWindowRelease(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestBulkWindowReleaseRetriesTimeoutWithoutLosingCredit(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
var calls atomic.Int32
|
||||
secondAttempt := make(chan struct{})
|
||||
bulk := newBulkHandle(ctx, newBulkRuntime("buffer-release-retry"), clientFileScope(), BulkOpenRequest{
|
||||
BulkID: "buffer-release-retry",
|
||||
DataID: 1,
|
||||
ChunkSize: 4,
|
||||
WindowBytes: 4,
|
||||
MaxInFlight: 1,
|
||||
}, 0, nil, nil, 0, nil, nil, nil, nil, func(_ *bulkHandle, bytes int64, chunks int) error {
|
||||
if bytes != 4 || chunks != 1 {
|
||||
t.Fatalf("release = (%d,%d), want (4,1)", bytes, chunks)
|
||||
}
|
||||
if calls.Add(1) == 1 {
|
||||
return context.DeadlineExceeded
|
||||
}
|
||||
close(secondAttempt)
|
||||
return nil
|
||||
})
|
||||
defer bulk.finalize()
|
||||
|
||||
bulk.maybeSendWindowRelease(4, true)
|
||||
select {
|
||||
case <-secondAttempt:
|
||||
case <-time.After(time.Second):
|
||||
t.Fatalf("window release was not retried, calls=%d", calls.Load())
|
||||
}
|
||||
bulk.mu.Lock()
|
||||
pendingBytes, pendingChunks, resetErr := bulk.pendingReleaseBytes, bulk.pendingReleaseChunks, bulk.resetErr
|
||||
bulk.mu.Unlock()
|
||||
if pendingBytes != 0 || pendingChunks != 0 {
|
||||
t.Fatalf("pending release after successful retry=(%d,%d), want zero", pendingBytes, pendingChunks)
|
||||
}
|
||||
if resetErr != nil {
|
||||
t.Fatalf("transient release timeout reset bulk: %v", resetErr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBulkWindowReleasePermanentErrorResetsBulk(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
bulk := newBulkHandle(ctx, newBulkRuntime("buffer-release-reset-error"), clientFileScope(), BulkOpenRequest{
|
||||
BulkID: "buffer-release-reset-error",
|
||||
DataID: 1,
|
||||
ChunkSize: 4,
|
||||
WindowBytes: 4,
|
||||
MaxInFlight: 1,
|
||||
}, 0, nil, nil, 0, nil, nil, nil, nil, func(_ *bulkHandle, bytes int64, chunks int) error {
|
||||
if bytes != 4 || chunks != 1 {
|
||||
t.Fatalf("release = (%d,%d), want (4,1)", bytes, chunks)
|
||||
}
|
||||
return errors.New("permanent release failure")
|
||||
})
|
||||
bulk.maybeSendWindowRelease(4, true)
|
||||
select {
|
||||
case <-bulk.releaseWorkerDone:
|
||||
case <-time.After(time.Second):
|
||||
t.Fatal("window release worker did not stop after permanent error")
|
||||
}
|
||||
if err := bulk.resetErrSnapshot(); err == nil || !strings.Contains(err.Error(), "permanent release failure") {
|
||||
t.Fatalf("reset error=%v, want permanent release failure", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLegacyBulkReleaseHonorsBulkCancellation(t *testing.T) {
|
||||
client := NewClient().(*ClientCommon)
|
||||
if err := UseModernPSKClient(client, integrationSharedSecret, integrationModernPSKOptions()); err != nil {
|
||||
|
||||
Reference in New Issue
Block a user