Skip to content

retry unix.EINTR for container init process #3045

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
kolyshkin merged 1 commit into from
Jul 8, 2021
Merged

retry unix.EINTR for container init process #3045

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion libcontainer/standard_init_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func (l *linuxStandardInit) Init() error {
return err
}

if err := unix.Exec(name, l.config.Args[0:], os.Environ()); err != nil {
if err := system.Exec(name, l.config.Args[0:], os.Environ()); err != nil {
return fmt.Errorf("can't exec user process: %w", err)
}
return nil
Expand Down
11 changes: 10 additions & 1 deletion libcontainer/system/linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,16 @@ func Execv(cmd string, args []string, env []string) error {
return err
}

return unix.Exec(name, args, env)
return Exec(name, args, env)
}

func Exec(cmd string, args []string, env []string) error {
for {
err := unix.Exec(cmd, args, env)
if err != unix.EINTR { //nolint:errorlint // unix errors are bare
return err
}
}
}

func Prlimit(pid, resource int, limit unix.Rlimit) error {
Expand Down