Skip to content

Fix pipe read race in exec_service server #12

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
afq984 merged 1 commit into from
Apr 8, 2026
+8 −4
Merged

Fix pipe read race in exec_service server #12

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
12 changes: 8 additions & 4 deletions exec_service/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,17 @@ func (s *ExecServer) RunCommand(req *pb.StartCommandRequest, stream pb.ExecServi
syscall.Kill(-cmd.Process.Pid, syscall.SIGKILL)
}

// Wait for the command concurrently. When it exits, expire the pipe
// read deadline so the read loop drains buffered output without
// blocking on background children that inherited the pipe fds.
// Wait for the command concurrently. When it exits, kill the
// process group so that background children close their inherited
// pipe fds, allowing the read loop to reach EOF cleanly. The
// deadline is a fallback for children that escaped the group
// (e.g. via setsid); it is not reached in the normal case
// because SIGKILL closes the pipe before the deadline fires.
waitCh := make(chan error, 1)
go func() {
err := cmd.Wait()
pr.SetReadDeadline(time.Now())
killGroup()
pr.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
waitCh <- err
}()

Expand Down
Loading