Skip to content

v2-server: 观察者关闭时 stream Next 返回 context.Canceled 而非 execution unavailable #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EricWvi merged 1 commit into from
Nov 10, 2026
Merged

v2-server: 观察者关闭时 stream Next 返回 context.Canceled 而非 execution unavailable #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions v2-server/internal/executionruntime/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,18 @@ type stream struct {
}

func (st *stream) Close() error { st.once.Do(st.cancel); return nil }

// asNextError prefers the query context's own cancellation over the error a cancelled
// call returned. Closing the observer (or the caller cancelling) mid-query surfaces as
// context.Canceled rather than a wrapped database error that publicError would classify
// as execution unavailable.
func (st *stream) asNextError(query context.Context, err error) error {
if qerr := query.Err(); qerr != nil {
return qerr
}
return publicError(err)
}

func (st *stream) Next(ctx context.Context) (execution.Event, error) {
query, cancel := context.WithCancel(ctx)
defer cancel()
Expand All @@ -45,22 +57,22 @@ func (st *stream) Next(ctx context.Context) (execution.Event, error) {
}
events, err := st.s.db.ReadExecutionEvents(query, st.scope, st.sid, st.cursor, 1)
if err != nil {
return execution.Event{}, publicError(err)
return execution.Event{}, st.asNextError(query, err)
}
if len(events) > 0 {
st.cursor = events[0].Sequence
return events[0], nil
}
session, err := st.s.ReadSession(query, st.scope, st.sid)
if err != nil {
return execution.Event{}, err
return execution.Event{}, st.asNextError(query, err)
}
if session.EndedAt != nil {
// End may commit between the empty event query and this session read. Recheck
// after observing EndedAt so the terminal event cannot be skipped as EOF.
events, err = st.s.db.ReadExecutionEvents(query, st.scope, st.sid, st.cursor, 1)
if err != nil {
return execution.Event{}, publicError(err)
return execution.Event{}, st.asNextError(query, err)
}
if len(events) > 0 {
st.cursor = events[0].Sequence
Expand Down
Loading