Merge pull request #3074 from kolyshkin/1.0-backport-3045

[1.0] retry unix.EINTR for container init process
This commit is contained in:
Mrunal Patel
2021-07-09 17:21:26 -04:00
committed by GitHub
2 changed files with 11 additions and 2 deletions
+1 -1
View File
@@ -224,7 +224,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 newSystemErrorWithCause(err, "exec user process")
}
return nil
+10 -1
View File
@@ -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 {