beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46227 from thaJeztah/supervisor_ignore_errs

Browse source 
libcontainerd/supervisor: explicitly ignore process kill errors
This commit is contained in:
Sebastiaan van Stijn 2023-11-22 08:40:45 +01:00 committed by GitHub
commit 54fcd40aa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libcontainerd/supervisor/remote_daemon.go
View file

@ -212,9 +212,8 @@ func (r *remote) startContainerd() error {
r.logger.WithError(err).Warn("failed to adjust OOM score")
}
err = pidfile.Write(r.pidFile, r.daemonPid)
if err != nil {
process.Kill(r.daemonPid)
if err := pidfile.Write(r.pidFile, r.daemonPid); err != nil {
_ = process.Kill(r.daemonPid)
return errors.Wrap(err, "libcontainerd: failed to save daemon pid to disk")
}

4
libcontainerd/supervisor/remote_daemon_linux.go
View file

@ -49,9 +49,9 @@ func (r *remote) stopDaemon() {
func (r *remote) killDaemon() {
// Try to get a stack trace
syscall.Kill(r.daemonPid, syscall.SIGUSR1)
_ = syscall.Kill(r.daemonPid, syscall.SIGUSR1)
<-time.After(100 * time.Millisecond)
process.Kill(r.daemonPid)
_ = process.Kill(r.daemonPid)
}
func (r *remote) platformCleanup() {

2
libcontainerd/supervisor/remote_daemon_windows.go
View file

@ -40,7 +40,7 @@ func (r *remote) stopDaemon() {
}
func (r *remote) killDaemon() {
process.Kill(r.daemonPid)
_ = process.Kill(r.daemonPid)
}
func (r *remote) platformCleanup() {