github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Increase reaper buffer size and non-blocking send

Browse Source 
Fixes #2709

This increases the buffer size for process exit subscribers. It also
implements a non-blocking send on the subscriber channel.  It is better
to drop an exit even than it is to block a shim for one slow subscriber.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2018-10-29 16:27:45 -04:00
parent 35a32a8778
commit 232a063496
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/v1/shim/reaper.go
View File

@ -26,12 +26,13 @@ import (
"github.com/containerd/containerd/sys" "github.com/containerd/containerd/sys"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
) )
// ErrNoSuchProcess is returned when the process no longer exists // ErrNoSuchProcess is returned when the process no longer exists
var ErrNoSuchProcess = errors.New("no such process") var ErrNoSuchProcess = errors.New("no such process")
const bufferSize = 32 const bufferSize = 2048
// Reap should be called when the process receives an SIGCHLD. Reap will reap // Reap should be called when the process receives an SIGCHLD. Reap will reap
// all exited processes and close their wait channels // all exited processes and close their wait channels
@ -41,13 +42,20 @@ func Reap() error {
Default.Lock() Default.Lock()
for c := range Default.subscribers { for c := range Default.subscribers {
for _, e := range exits { for _, e := range exits {
c <- runc.Exit{ select {
case c <- runc.Exit{
Timestamp: now, Timestamp: now,
Pid: e.Pid, Pid: e.Pid,
Status: e.Status, Status: e.Status,
}:
default:
logrus.WithFields(logrus.Fields{
"subscriber": c,
"pid": e.Pid,
"status": e.Status,
}).Warn("failed to send exit to subscriber")
} }
} }
} }
Default.Unlock() Default.Unlock()
return err return err

14
runtime/v2/shim/reaper_unix.go
View File

@ -26,12 +26,13 @@ import (
"github.com/containerd/containerd/sys" "github.com/containerd/containerd/sys"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
) )
// ErrNoSuchProcess is returned when the process no longer exists // ErrNoSuchProcess is returned when the process no longer exists
var ErrNoSuchProcess = errors.New("no such process") var ErrNoSuchProcess = errors.New("no such process")
const bufferSize = 32 const bufferSize = 2048
// Reap should be called when the process receives an SIGCHLD. Reap will reap // Reap should be called when the process receives an SIGCHLD. Reap will reap
// all exited processes and close their wait channels // all exited processes and close their wait channels
@ -41,13 +42,20 @@ func Reap() error {
Default.Lock() Default.Lock()
for c := range Default.subscribers { for c := range Default.subscribers {
for _, e := range exits { for _, e := range exits {
c <- runc.Exit{ select {
case c <- runc.Exit{
Timestamp: now, Timestamp: now,
Pid: e.Pid, Pid: e.Pid,
Status: e.Status, Status: e.Status,
}:
default:
logrus.WithFields(logrus.Fields{
"subscriber": c,
"pid": e.Pid,
"status": e.Status,
}).Warn("failed to send exit to subscriber")
} }
} }
} }
Default.Unlock() Default.Unlock()
return err return err