Skip to content

Fix descendant completion regression racing successful cleanup #216

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
Vbitz merged 1 commit into from
Oct 9, 2026
Merged

Fix descendant completion regression racing successful cleanup #216

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
29 changes: 23 additions & 6 deletions guestinit/process_completion_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,15 @@ func TestManagedExecEscapedHelper(t *testing.T) {
fmt.Fprintln(os.Stderr, "escaped stderr")
ctl := os.NewFile(3, "control")
fmt.Fprintln(ctl, `{"escaped":true}`)
if err := os.WriteFile(path, []byte(strconv.Itoa(os.Getpid())), 0600); err != nil {
// Publish setsid proof atomically before the parent may exit. The
// process can legitimately be reaped before the test reads this file.
proof := []byte(fmt.Sprintf("%d %d", os.Getpid(), syscall.Getpgrp()))
if err := os.WriteFile(path+".ready", proof, 0600); err != nil {
os.Exit(91)
}
if err := os.Rename(path+".ready", path); err != nil {
os.Exit(94)
}
time.Sleep(30 * time.Second)
os.Exit(0)
}
Expand All @@ -48,7 +54,14 @@ func TestManagedExecEscapedHelper(t *testing.T) {
if err := cmd.Start(); err != nil {
os.Exit(93)
}
if role != "fast" {
if role == "fast" {
for {
if _, err := os.Stat(path); err == nil {
break
}
time.Sleep(time.Millisecond)
}
} else {
for {
if _, err := os.Stat(path + ".release"); err == nil {
break
Expand Down Expand Up @@ -100,10 +113,15 @@ func TestManagedExecEscapedCompletion(t *testing.T) {
t.Error("worker did not stop after test cleanup")
}
}()
pgid := 0
deadline := time.Now().Add(4 * time.Second)
for time.Now().Before(deadline) {
data, _ := os.ReadFile(path)
child, _ = strconv.Atoi(strings.TrimSpace(string(data)))
fields := strings.Fields(string(data))
if len(fields) == 2 {
child, _ = strconv.Atoi(fields[0])
pgid, _ = strconv.Atoi(fields[1])
}
managed.stdinMu.Lock()
started := managed.process != nil
managed.stdinMu.Unlock()
Expand All @@ -115,9 +133,8 @@ func TestManagedExecEscapedCompletion(t *testing.T) {
if child <= 0 {
t.Fatal("escaped descendant did not start")
}
pgid, err := syscall.Getpgid(child)
if err != nil || pgid != child {
t.Fatalf("descendant did not setsid: pgid=%d err=%v", pgid, err)
if pgid != child {
t.Fatalf("descendant did not setsid: pid=%d pgid=%d", child, pgid)
}
if action == "tty" {
if err := managed.resize(100, 30); err != nil {
Expand Down
Loading