1f2e74acca
- 完善 stream/bulk DataID 分配、预留和双向命名空间,修复并发打开及 dedicated/shared 回退时的 ID 冲突 - 将收发、回复、恢复任务和 sidecar 绑定原始会话与物理连接,防止重连后的旧消息误操作新连接 - 加强 close/reset 身份校验及实例移除检查,修复 dedicated attach 失败、通道引用和资源回收竞态 - 收紧批量发送器停止准入,确保在途入队完成后统一清理请求、缓冲区和等待者 - 修复 record 满队列死锁、取消时序号消耗及关闭竞态,确保关闭有界并返回真实错误 - 增加协商式 record 逻辑半关闭,保留反向 ACK;通过 reset 传递 RecordFailure,避免背压掩盖原始失败原因 - 补齐帧长度、批次数量、序号溢出和未确认窗口校验,提前拒绝超限数据并按字节预算拆批 - 为入站分发增加全局及单连接的条数、字节预算和阻塞背压,关闭时唤醒等待者,消除正常断连日志噪音 - 完善 bulk 窗口释放失败处理与传输诊断,补充并发、重连、背压、协议边界及真实 TCP 回归覆盖
178 lines
4.7 KiB
Go
178 lines
4.7 KiB
Go
package notify
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/binary"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
type delayedRecordPacket struct {
|
|
data []byte
|
|
ready time.Time
|
|
}
|
|
|
|
// Delay packets in a bounded pipeline so latency does not serialize every write.
|
|
func startRecordLinkProxy(t *testing.T, upstream string, mbps int, rtt time.Duration) string {
|
|
t.Helper()
|
|
listener, err := net.Listen("tcp", "127.0.0.1:0")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
var workers sync.WaitGroup
|
|
workers.Add(1)
|
|
go func() {
|
|
defer workers.Done()
|
|
left, err := listener.Accept()
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer left.Close()
|
|
right, err := (&net.Dialer{}).DialContext(ctx, "tcp", upstream)
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer right.Close()
|
|
stopConn := context.AfterFunc(ctx, func() { _ = left.Close(); _ = right.Close() })
|
|
defer stopConn()
|
|
var relays sync.WaitGroup
|
|
relay := func(dst, src net.Conn) {
|
|
defer relays.Done()
|
|
packets := make(chan delayedRecordPacket, 128)
|
|
var reader sync.WaitGroup
|
|
reader.Add(1)
|
|
go func() {
|
|
defer reader.Done()
|
|
defer close(packets)
|
|
buf := make([]byte, 16*1024)
|
|
for {
|
|
n, err := src.Read(buf)
|
|
if n > 0 {
|
|
packet := delayedRecordPacket{append([]byte(nil), buf[:n]...), time.Now().Add(rtt / 2)}
|
|
select {
|
|
case packets <- packet:
|
|
case <-ctx.Done():
|
|
return
|
|
}
|
|
}
|
|
if err != nil {
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
defer reader.Wait()
|
|
defer cancel()
|
|
var next time.Time
|
|
for packet := range packets {
|
|
if next.Before(time.Now()) {
|
|
next = time.Now()
|
|
}
|
|
next = next.Add(time.Duration(len(packet.data)) * time.Second / time.Duration(mbps*1000*1000/8))
|
|
ready := packet.ready
|
|
if next.After(ready) {
|
|
ready = next
|
|
}
|
|
timer := time.NewTimer(time.Until(ready))
|
|
select {
|
|
case <-ctx.Done():
|
|
timer.Stop()
|
|
return
|
|
case <-timer.C:
|
|
}
|
|
if err := writeFullToConn(dst, packet.data); err != nil {
|
|
return
|
|
}
|
|
}
|
|
}
|
|
relays.Add(2)
|
|
go relay(right, left)
|
|
go relay(left, right)
|
|
relays.Wait()
|
|
}()
|
|
t.Cleanup(func() { cancel(); _ = listener.Close(); workers.Wait() })
|
|
return listener.Addr().String()
|
|
}
|
|
|
|
func TestRecordTCPDelayedBandwidth(t *testing.T) {
|
|
for _, tc := range []struct {
|
|
mbps int
|
|
rtt time.Duration
|
|
}{{10, 80 * time.Millisecond}, {50, 160 * time.Millisecond}, {100, 80 * time.Millisecond}} {
|
|
t.Run(fmt.Sprintf("%dMbps-%s", tc.mbps, tc.rtt), func(t *testing.T) {
|
|
server := NewServer().(*ServerCommon)
|
|
if err := UseModernPSKServer(server, integrationSharedSecret, integrationModernPSKOptions()); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
const count, size = 512, 2048
|
|
handlerDone := make(chan error, 1)
|
|
server.SetRecordStreamHandler(func(info RecordAcceptInfo) error {
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
for i := 0; i < count; i++ {
|
|
msg, err := info.RecordStream.ReadRecord(ctx)
|
|
if err != nil {
|
|
handlerDone <- err
|
|
return err
|
|
}
|
|
want := bytes.Repeat([]byte{byte(i)}, size)
|
|
binary.BigEndian.PutUint64(want[:8], uint64(i))
|
|
if msg.Seq != uint64(i+1) || !bytes.Equal(msg.Payload, want) {
|
|
err = fmt.Errorf("record %d corrupted", i)
|
|
handlerDone <- err
|
|
return err
|
|
}
|
|
if err := info.RecordStream.AckRecord(msg.Seq); err != nil {
|
|
handlerDone <- err
|
|
return err
|
|
}
|
|
}
|
|
handlerDone <- nil
|
|
return nil
|
|
})
|
|
if err := server.Listen("tcp", "127.0.0.1:0"); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Cleanup(func() { _ = server.Stop() })
|
|
proxy := startRecordLinkProxy(t, server.listener.Addr().String(), tc.mbps, tc.rtt)
|
|
client := NewClient().(*ClientCommon)
|
|
if err := UseModernPSKClient(client, integrationSharedSecret, integrationModernPSKOptions()); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := client.Connect("tcp", proxy); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
t.Cleanup(func() { _ = client.Stop() })
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
r, err := client.OpenRecordStream(ctx, RecordOpenOptions{})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
started := time.Now()
|
|
for i := 0; i < count; i++ {
|
|
payload := bytes.Repeat([]byte{byte(i)}, size)
|
|
binary.BigEndian.PutUint64(payload[:8], uint64(i))
|
|
if _, err := r.WriteRecord(ctx, payload); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
if acked, err := r.Barrier(ctx); err != nil || acked != count {
|
|
t.Fatalf("barrier ack=%d err=%v", acked, err)
|
|
}
|
|
if err := <-handlerDone; err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := r.Close(); err != nil && err != io.EOF {
|
|
t.Fatal(err)
|
|
}
|
|
t.Logf("verified %d records, %d bytes in %s", count, count*size, time.Since(started))
|
|
})
|
|
}
|
|
}
|