8 changed files with 138 additions and 372 deletions
+1 -3
View File
@@ -335,9 +335,7 @@ func runServe(ctx context.Context, cfg config.Config) error {
drainCancel()
shutCtx, shutCancel := context.WithTimeout(context.Background(), 5*time.Second)
if shutErr := brk.Shutdown(shutCtx); shutErr != nil && !errors.Is(shutErr, context.DeadlineExceeded) && !errors.Is(shutErr, context.Canceled) {
slog.Error("broker shutdown", "err", shutErr)
}
_ = brk.Shutdown(shutCtx)
shutCancel()
secondDrain := drainBudget - time.Since(drainStart)
+7 -7
View File
@@ -1719,12 +1719,12 @@ issue #3 未关闭,`feat/fix-3-downlink-deadlock` 未合入 `main`。下面是
- 备选方案:为每个未测子项补验收用例(本波不做,避免为变绿放松断言)。
- 影响:汇总改为通过 19、部分通过 4(F03/F08/F21/F22)、失败 0。F19 仍引用仓库内 SDK 清单、本波不重跑。
### 复审修复 R3-02
### 复审修复 R3-07
1. **积压时 fatal/logout 与停机 0x8B 须等本帧写出**
1. **客户端建群事务内复核创建者**
- 日期:2026-09-30
- 原条款:Gitea #66;B-04 / B-08。
- 实际做法:带断开的下行帧用本帧 `OnPacketSent` 完成信号(优先 packet id,否则按载荷匹配),不再用连接级 `sentPub` 总数。`Shutdown` 在 ctx 未取消时先等下行队列与 `wirePending` 排空,再 `DisconnectClient` 发 `0x8B` 并在截止前等连接拆掉;ctx 已取消则发完即 `Close`。`serve` 仍给 5 秒预算并记录非超时错误。未合 `feat/fix-3-downlink-deadlock`。
- 原因:前面 PUBLISH 的 `OnPacketSent` 会让总数等待提前返回;`Shutdown` 对 ctx 非阻塞 select 使 5 秒预算用不上,有 outbound 积压时 `0x8B` 只进 outbuf 随 `Stop` 丢掉。
- 备选方案:恢复固定 `Sleep`(否决);改 `PublishDown` 签名(否决)。
- 影响:队列/outbound 有积压时 fatal、logout 先到客户端再断开;停机在预算内尽量发出 `0x8B`,超时返回 ctx 错误而非空等。
- 原条款:Gitea #71。`group.Create` 在 `Queue.Do` 里直接 `insertMemberTx` 群主,不跑 `endpointCheckTx`;停用/删除与建群抢在事务外对话密码窗口时,可插入已停用甚至刚删除的 `owner_id`。
- 实际做法:`Create` 同一写事务里,插入群与群主成员之前对 `actorID` 做与 `createAdmin` 相同的 `endpointCheckTx`;已停用 `endpoint_disabled`,不存在 `invalid_target`,且不插入群。不改 `emit`、不改迁移编号。
- 原因:成员侧已有事务内复核,群主侧缺对称校验,竞态会留下非法群主。
- 备选方案:事务外再查一次创建者(否决,无法覆盖密码窗口与写事务之间的竞态)。
- 影响:创建者在进入写事务前被停用/删除时建群失败且无新群行;与后台建群错误码对齐。
+9
View File
@@ -147,6 +147,15 @@ func (a *App) Create(ctx context.Context, actorID string, req *protocol.GroupCre
var inserted []string
err := a.db.Queue.Do(ctx, func(tx *sql.Tx) error {
if e := endpointCheckTx(tx, actorID); e != nil {
if protoCode(e) == protocol.CodeInvalidTarget {
return errCode(protocol.CodeInvalidTarget, "owner not found")
}
if protoCode(e) == protocol.CodeEndpointDisabled {
return errCode(protocol.CodeEndpointDisabled, "owner disabled")
}
return e
}
var exists int
qErr := tx.QueryRow(`SELECT 1 FROM groups WHERE id = ?`, gid).Scan(&exists)
if qErr == nil {
+100
View File
@@ -604,6 +604,106 @@ func TestU02CreateDedupesMembers(t *testing.T) {
}
}
// raceTalk 在对话密码校验成功后执行一次 mutate,模拟事务外密码窗口里创建者被停用/删除。
type raceTalk struct {
inner group.TalkGate
mutate func()
once sync.Once
}
func (r *raceTalk) CheckTalkPasswordForJoin(ctx context.Context, actorID, targetID, talkPassword, remoteIP string) error {
err := r.inner.CheckTalkPasswordForJoin(ctx, actorID, targetID, talkPassword, remoteIP)
if err == nil && r.mutate != nil {
r.once.Do(r.mutate)
}
return err
}
func TestR307CreateRejectsActorDisabledOrDeletedBeforeWrite(t *testing.T) {
t.Parallel()
cases := []struct {
name string
code string
mutate func(ctx context.Context, t *testing.T, idApp *identity.App, db *store.DB)
}{
{
name: "disabled",
code: protocol.CodeEndpointDisabled,
mutate: func(ctx context.Context, t *testing.T, idApp *identity.App, _ *store.DB) {
t.Helper()
if err := idApp.Disable(ctx, "alice"); err != nil {
t.Fatal(err)
}
},
},
{
name: "deleted",
code: protocol.CodeInvalidTarget,
mutate: func(ctx context.Context, t *testing.T, idApp *identity.App, _ *store.DB) {
t.Helper()
if err := idApp.Delete(ctx, "alice"); err != nil {
t.Fatal(err)
}
},
},
}
for _, tc := range cases {
tc := tc
t.Run(tc.name, func(t *testing.T) {
t.Parallel()
db, err := store.Open(filepath.Join(t.TempDir(), "data"), "FULL")
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() { _ = db.Close() })
fixed := time.UnixMilli(1_700_000_000_000)
locks := auth.NewLoginLocks()
idApp := identity.New(identity.Config{
DB: db, Hash: auth.NewStubHashPool(), Locks: locks,
Sessions: auth.NewSessionTokens(),
Now: func() time.Time { return fixed },
})
gate := &raceTalk{inner: idApp}
gApp := group.New(group.Config{
DB: db, Talk: gate, MaxGroupMembers: 1000,
Now: func() time.Time { return fixed }, DefaultRemoteIP: "1.1.1.1",
})
ctx := context.Background()
insertEP(t, db, "alice", 1)
insertEP(t, db, "bob", 1)
if err := idApp.SelfSetTalkPassword(ctx, "bob", "secret"); err != nil {
t.Fatal(err)
}
gate.mutate = func() { tc.mutate(ctx, t, idApp, db) }
var before int
if qErr := db.Read.QueryRow(`SELECT COUNT(*) FROM groups`).Scan(&before); qErr != nil {
t.Fatal(qErr)
}
_, err = gApp.Create(ctx, "alice", &protocol.GroupCreate{
V: protocol.Version, Type: protocol.TypeGroupCreate, RID: "1",
ID: "g_r307_" + tc.name, Name: "竞态群",
Members: []protocol.GroupMemberIn{{ID: "bob", TalkPassword: "secret"}},
})
if protoCode(err) != tc.code {
t.Fatalf("want %s got %v", tc.code, err)
}
var after int
if qErr := db.Read.QueryRow(`SELECT COUNT(*) FROM groups`).Scan(&after); qErr != nil {
t.Fatal(qErr)
}
if after != before {
t.Fatalf("groups leaked: before=%d after=%d", before, after)
}
var exists int
qErr := db.Read.QueryRow(`SELECT 1 FROM groups WHERE id = ?`, "g_r307_"+tc.name).Scan(&exists)
if !errors.Is(qErr, sql.ErrNoRows) {
t.Fatalf("expected no group row, got exists=%d err=%v", exists, qErr)
}
})
}
}
func TestU02AdminCreateOwnerMustExistAndEnabled(t *testing.T) {
t.Parallel()
gApp, _, _, db, down := setup(t)
-158
View File
@@ -87,50 +87,6 @@ func TestPublishThenDisconnectWritesThenCloses(t *testing.T) {
}
}
func TestPublishThenDisconnectAfterQueuedFrame(t *testing.T) {
b, w, done := startTCPClient(t, "ep-ptd-q")
defer func() { _ = b.Close() }()
defer func() {
_ = w.Close()
select {
case <-done:
case <-time.After(3 * time.Second):
}
}()
writeConnect(t, w, "ep-ptd-q", 30, 0)
readExactPacket(t, w, packets.Connack, 3*time.Second)
writeSubscribe(t, w, downTopic("ep-ptd-q"))
readExactPacket(t, w, packets.Suback, 3*time.Second)
waitSession(t, b, "ep-ptd-q")
first := []byte(`{"v":1,"type":"msg","id":"queued-ahead"}`)
fatal := []byte(`{"v":1,"type":"fatal","reason":"disabled"}`)
if err := b.PublishDown(context.Background(), "ep-ptd-q", "", first, port.PublishOpts{QoS: 1}); err != nil {
t.Fatal(err)
}
if err := b.PublishThenDisconnect(context.Background(), "ep-ptd-q", "", fatal, 1, port.DisconnectFatal); err != nil {
t.Fatal(err)
}
gotFirst := readDownPayload(t, w, 3*time.Second)
if !bytes.Equal(gotFirst, first) {
t.Fatalf("first got %s", gotFirst)
}
gotFatal := readDownPayload(t, w, 3*time.Second)
if !bytes.Equal(gotFatal, fatal) {
t.Fatalf("fatal got %s want %s (disconnected before fatal frame)", gotFatal, fatal)
}
_ = w.SetReadDeadline(time.Now().Add(3 * time.Second))
buf := make([]byte, 64)
n, err := io.ReadAtLeast(w, buf, 2)
if err != nil && n == 0 {
return
}
if n > 0 && buf[0]>>4 == packets.Disconnect {
return
}
}
func TestShutdownUsesServerShuttingDown(t *testing.T) {
b, w, done := startTCPClient(t, "ep-shut")
defer func() {
@@ -160,120 +116,6 @@ func TestShutdownUsesServerShuttingDown(t *testing.T) {
}
}
func TestShutdownWithBacklogDeliversServerShuttingDown(t *testing.T) {
b, w, done := startTCPClient(t, "ep-shut-bl")
defer func() {
_ = w.Close()
select {
case <-done:
case <-time.After(3 * time.Second):
}
}()
writeConnect(t, w, "ep-shut-bl", 30, 0)
readExactPacket(t, w, packets.Connack, 3*time.Second)
writeSubscribe(t, w, downTopic("ep-shut-bl"))
readExactPacket(t, w, packets.Suback, 3*time.Second)
waitSession(t, b, "ep-shut-bl")
payload := bytes.Repeat([]byte("b"), 1024)
for i := 0; i < 8; i++ {
if err := b.PublishDown(context.Background(), "ep-shut-bl", "", payload, port.PublishOpts{QoS: 1}); err != nil {
t.Fatalf("publish %d: %v", i, err)
}
}
saw8B := make(chan bool, 1)
go func() {
deadline := time.Now().Add(3 * time.Second)
for time.Now().Before(deadline) {
_ = w.SetReadDeadline(time.Now().Add(200 * time.Millisecond))
hdr := make([]byte, 1)
if _, err := io.ReadFull(w, hdr); err != nil {
continue
}
rem, err := readRemainingLengthConn(w)
if err != nil {
continue
}
body := make([]byte, rem)
if _, err := io.ReadFull(w, body); err != nil {
continue
}
switch hdr[0] >> 4 {
case packets.Publish:
qos := (hdr[0] >> 1) & 0x3
if qos > 0 {
pk := new(packets.Packet)
pk.ProtocolVersion = 5
pk.FixedHeader = packets.FixedHeader{Type: packets.Publish, Remaining: rem, Qos: qos}
if decErr := pk.PublishDecode(body); decErr == nil {
ack := packets.Packet{
FixedHeader: packets.FixedHeader{Type: packets.Puback},
ProtocolVersion: 5,
PacketID: pk.PacketID,
}
var ab bytes.Buffer
_ = ack.PubackEncode(&ab)
_, _ = w.Write(ab.Bytes())
}
}
case packets.Disconnect:
if rem >= 1 && body[0] == packets.ErrServerShuttingDown.Code {
saw8B <- true
return
}
}
}
saw8B <- false
}()
time.Sleep(20 * time.Millisecond)
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
defer cancel()
err := b.Shutdown(ctx)
got := false
select {
case got = <-saw8B:
case <-time.After(4 * time.Second):
t.Fatal("reader hung")
}
if got {
if err != nil && !errors.Is(err, context.DeadlineExceeded) {
t.Fatalf("shutdown after 0x8B: %v", err)
}
return
}
if err == nil {
t.Fatal("expected 0x8B or shutdown deadline error, got neither")
}
if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) {
t.Fatalf("shutdown err=%v want deadline/cancel when 0x8B not seen", err)
}
}
func TestShutdownCancelledContextReturnsQuickly(t *testing.T) {
b, w, done := startTCPClient(t, "ep-shut-cancel")
defer func() {
_ = w.Close()
select {
case <-done:
case <-time.After(3 * time.Second):
}
}()
writeConnect(t, w, "ep-shut-cancel", 30, 0)
readExactPacket(t, w, packets.Connack, 3*time.Second)
waitSession(t, b, "ep-shut-cancel")
ctx, cancel := context.WithCancel(context.Background())
cancel()
start := time.Now()
_ = b.Shutdown(ctx)
if time.Since(start) > 500*time.Millisecond {
t.Fatalf("cancelled shutdown took %s", time.Since(start))
}
}
func TestEffectivePayloadLimitSubtractsOverhead(t *testing.T) {
got := EffectivePayloadLimit(200, 0)
if got != 200-packetOverheadBudget {
+5 -87
View File
@@ -141,14 +141,9 @@ type connState struct {
downStop chan struct{}
downDone chan struct{}
downBytes atomic.Int64
wirePending atomic.Int64 // Publish 入 mochi outbound 后、OnPacketSent 前
sentPub atomic.Int64
mu sync.Mutex
// 带断开的下行帧:只等本帧 OnPacketSent,不用连接级计数。
writeWaitCh chan struct{}
writeWaitPayload []byte
writeWaitPID uint16 // 非 0 时优先按 packet id 匹配
handshakeTimer *time.Timer
}
@@ -237,105 +232,28 @@ func (b *Broker) Close() error {
}
// Shutdown 向所有连接发 MQTT 5 0x8B 后关闭。完整 HTTP 停机顺序见 L-03。
// ctx 未取消时先等下行队列与 wirePending 排空,再 DisconnectClient(此时 outbound 空,
// 0x8B 直写套接字),并在截止前等连接拆掉;ctx 已取消则发完即 Close,不等待。
func (b *Broker) Shutdown(ctx context.Context) error {
if b.closed.Load() {
return nil
}
if ctx == nil {
ctx = context.Background()
}
b.connsMu.RLock()
states := make([]*connState, 0, len(b.byClient))
clients := make([]*mqtt.Client, 0, len(b.byClient))
for cl, st := range b.byClient {
for cl := range b.byClient {
if cl != nil {
clients = append(clients, cl)
}
if st != nil {
states = append(states, st)
}
}
b.connsMu.RUnlock()
for _, st := range states {
st.mu.Lock()
st.closing = true
st.mu.Unlock()
}
alreadyCancelled := false
select {
case <-ctx.Done():
alreadyCancelled = true
default:
}
var waitErr error
if !alreadyCancelled {
if !b.waitConnsQuiet(ctx, states) {
waitErr = ctx.Err()
}
}
for _, cl := range clients {
_ = b.server.DisconnectClient(cl, packets.ErrServerShuttingDown)
}
if !alreadyCancelled && waitErr == nil {
waitErr = b.waitConnsGone(ctx)
}
closeErr := b.Close()
if waitErr != nil {
return waitErr
}
return closeErr
}
func (b *Broker) waitConnsQuiet(ctx context.Context, states []*connState) bool {
for {
quiet := true
for _, st := range states {
if st.wirePending.Load() > 0 {
quiet = false
break
}
st.mu.Lock()
ch := st.downCh
st.mu.Unlock()
if ch != nil && len(ch) > 0 {
quiet = false
break
}
}
if quiet {
return true
}
if ctx != nil {
select {
case <-ctx.Done():
return false
case <-time.After(2 * time.Millisecond):
}
}
}
func (b *Broker) waitConnsGone(ctx context.Context) error {
for {
b.connsMu.RLock()
n := len(b.byClient)
b.connsMu.RUnlock()
if n == 0 {
return nil
}
select {
case <-ctx.Done():
return ctx.Err()
case <-time.After(2 * time.Millisecond):
default:
}
}
return b.Close()
}
// AttachTCP 把裸 TCP/TLS 连接交给 mochi;阻塞到连接结束。
+12 -115
View File
@@ -1,12 +1,10 @@
package broker
import (
"bytes"
"context"
"time"
"git.asio.asia/nixevol/NixMsg/internal/app/port"
"github.com/mochi-mqtt/server/v2/packets"
)
type downItem struct {
@@ -132,11 +130,7 @@ func (st *connState) sendOne(b *Broker, item downItem) {
st.mu.Unlock()
}
topic := downTopic(st.endpointID)
var waitCh chan struct{}
if item.disconnect != "" {
waitCh = st.armWriteWait(item.payload)
}
st.wirePending.Add(1)
before := st.sentPub.Load()
var err error
for !b.closed.Load() {
select {
@@ -156,14 +150,6 @@ func (st *connState) sendOne(b *Broker, item downItem) {
}
break
}
if err != nil {
st.wirePending.Add(-1)
st.clearWriteWait(waitCh)
} else if waitCh != nil {
if pid, ok := st.lookupInflightPID(item.payload); ok {
st.setWriteWaitPID(waitCh, pid)
}
}
if large {
b.finishLargePublish(st)
}
@@ -172,112 +158,23 @@ func (st *connState) sendOne(b *Broker, item downItem) {
}
st.signalSent(item)
if err == nil && item.disconnect != "" {
st.waitWriteDone(waitCh)
st.waitPacketWritten(before)
_ = b.Disconnect(context.Background(), st.endpointID, st.connID, item.disconnect)
}
}
func (st *connState) armWriteWait(payload []byte) chan struct{} {
ch := make(chan struct{})
st.mu.Lock()
st.writeWaitCh = ch
st.writeWaitPayload = payload
st.writeWaitPID = 0
st.mu.Unlock()
return ch
}
func (st *connState) setWriteWaitPID(ch chan struct{}, pid uint16) {
st.mu.Lock()
if st.writeWaitCh == ch {
st.writeWaitPID = pid
}
st.mu.Unlock()
}
func (st *connState) clearWriteWait(ch chan struct{}) {
if ch == nil {
return
}
st.mu.Lock()
if st.writeWaitCh == ch {
st.writeWaitCh = nil
st.writeWaitPayload = nil
st.writeWaitPID = 0
}
st.mu.Unlock()
}
func (st *connState) waitWriteDone(ch chan struct{}) {
if ch == nil {
return
}
defer st.clearWriteWait(ch)
deadline := time.NewTimer(2 * time.Second)
defer deadline.Stop()
select {
case <-ch:
case <-st.downStop:
case <-deadline.C:
}
}
func (st *connState) notePacketSent(pk packets.Packet) {
if pk.FixedHeader.Type == packets.Publish {
for {
cur := st.wirePending.Load()
if cur <= 0 {
break
}
if st.wirePending.CompareAndSwap(cur, cur-1) {
break
}
func (st *connState) waitPacketWritten(before int64) {
deadline := time.Now().Add(2 * time.Second)
for time.Now().Before(deadline) {
if st.sentPub.Load() > before {
return
}
select {
case <-st.downStop:
return
case <-time.After(2 * time.Millisecond):
}
}
st.mu.Lock()
ch := st.writeWaitCh
pid := st.writeWaitPID
want := st.writeWaitPayload
st.mu.Unlock()
if ch == nil || pk.FixedHeader.Type != packets.Publish {
return
}
match := false
if pid != 0 {
match = pk.PacketID == pid
} else if want != nil {
match = bytes.Equal(pk.Payload, want)
}
if !match {
return
}
st.mu.Lock()
if st.writeWaitCh == ch {
st.writeWaitCh = nil
st.writeWaitPayload = nil
st.writeWaitPID = 0
}
st.mu.Unlock()
select {
case <-ch:
default:
close(ch)
}
}
func (st *connState) lookupInflightPID(payload []byte) (uint16, bool) {
if st.client == nil || st.client.State.Inflight == nil {
return 0, false
}
for _, pk := range st.client.State.Inflight.GetAll(false) {
if pk.FixedHeader.Type != packets.Publish {
continue
}
if bytes.Equal(pk.Payload, payload) {
return pk.PacketID, pk.PacketID != 0
}
}
return 0, false
}
func (st *connState) signalSent(item downItem) {
+4 -2
View File
@@ -175,11 +175,14 @@ func (h *nixHook) OnSubscribed(cl *mqtt.Client, pk packets.Packet, reasonCodes [
}
func (h *nixHook) OnPacketSent(cl *mqtt.Client, pk packets.Packet, _ []byte) {
if pk.FixedHeader.Type != packets.Publish {
return
}
h.b.connsMu.RLock()
st := h.b.byClient[cl]
h.b.connsMu.RUnlock()
if st != nil {
st.notePacketSent(pk)
st.sentPub.Add(1)
}
}
@@ -251,7 +254,6 @@ func (h *nixHook) OnDisconnect(cl *mqtt.Client, err error, _ bool) {
lk.Lock()
st.stopDownLoop()
lk.Unlock()
st.wirePending.Store(0)
h.b.releaseAllLarge(st)
h.b.cancelHandshakeDeadline(st.endpointID, st.connID)