Stop the stdio channel holding its lock across a pipe write, so a refused subscribe cannot deadlock it (issue 1286)
mesh/merge-gate head eaec209a371b merged into trunk 9ebfb87b5d0c — pass, with a note: builds mesh-sdk (+41 dependent(s)) → ace, g14, novox, shanks; no bus …
mesh/repo-check head eaec209a371b merged into trunk 9ebfb87b5d0c — pass: its merge-check.sh passed, each part in its toolchain: merge-check.sh (typescript)…
mesh/delivery delivered

This commit is contained in:
2026-10-19 21:51:13 +02:00
parent 9ebfb87b5d
commit eaec209a37
2 changed files with 58 additions and 3 deletions
+51
View File
@@ -224,3 +224,54 @@ func TestARefusedSubscribeLeavesNoHandlerBehind(t *testing.T) {
t.Fatalf("one event was handled %d times", handled)
}
}
// A message the runtime has not read yet does not stop the channel taking its answers: with one tool
// answer blocked on the pipe, a refused subscribe is still delivered to Subscribe, which returns the
// refusal — no lock of the channel is held across a write to the pipe (novox/hq issue 1286/AC1, 1286/AC2).
func TestARefusedSubscribeIsDeliveredWhileAMessageWaitsOnThePipe(t *testing.T) {
t.Setenv(ServedAs, "plex")
inR, inW := io.Pipe()
outR, outW := io.Pipe()
defer func() { _ = inW.Close() }()
// Not the channel an earlier run left behind: Subscribe goes to the one this run serves.
currentMu.Lock()
current = nil
currentMu.Unlock()
go func() {
_ = ServeOn("", []Tool{{Name: "quick", Run: func(map[string]any) (any, error) { return "ok", nil }}}, inR, outW)
}()
subscribed := make(chan error, 1)
go func() {
for {
if _, err := live(); err == nil {
break
}
time.Sleep(time.Millisecond)
}
subscribed <- Subscribe("*.download.completed", func(Envelope) error { return nil })
}()
go func() {
lines := bufio.NewScanner(outR)
if !lines.Scan() {
return
}
var req map[string]any
_ = json.Unmarshal(lines.Bytes(), &req)
send := func(m map[string]any) { b, _ := json.Marshal(m); _, _ = inW.Write(append(b, '\n')) }
// A tool answer the runtime has not read: its write waits on the pipe, and no one reads further.
send(map[string]any{"jsonrpc": "2.0", "id": 1, "method": "tools/call", "params": map[string]any{"name": "quick"}})
time.Sleep(100 * time.Millisecond)
send(map[string]any{"jsonrpc": "2.0", "id": req["id"], "error": map[string]any{"code": -32000, "message": "not yet"}})
}()
deadline := time.After(2 * time.Second)
select {
case err := <-subscribed:
if err == nil || err.Error() != "not yet" {
t.Fatalf("the refused subscribe said %v", err)
}
case <-deadline:
t.Fatal("Subscribe did not return in 2 s: the channel is stuck on a write to a pipe nobody reads")
}
// Let the waiting answer go, so nothing is left blocked.
go func() { _, _ = io.Copy(io.Discard, outR) }()
}