containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5474 from giuseppe/detect-containers-rootlessport-child-exit 

rootlessport: detect rootless-child exit
This commit is contained in:
OpenShift Merge Robot 2020-03-12 10:22:34 -04:00 committed by GitHub
parent 235f367861 647dc33e1a
commit 9c7481dbd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/rootlessport/rootlessport_linux.go
View File

@ -160,6 +160,13 @@ func parent() error {
return err return err
} }
childErrCh := make(chan error)
go func() {
err := cmd.Wait()
childErrCh <- err
close(childErrCh)
}()
defer func() { defer func() {
if err := syscall.Kill(cmd.Process.Pid, syscall.SIGTERM); err != nil { if err := syscall.Kill(cmd.Process.Pid, syscall.SIGTERM); err != nil {
logrus.WithError(err).Warn("kill child process") logrus.WithError(err).Warn("kill child process")
@ -174,6 +181,10 @@ outer:
case <-initComplete: case <-initComplete:
logrus.Infof("initComplete is closed; parent and child established the communication channel") logrus.Infof("initComplete is closed; parent and child established the communication channel")
break outer break outer
case err := <-childErrCh:
if err != nil {
return err
}
case err := <-errCh: case err := <-errCh:
if err != nil { if err != nil {
return err return err