mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
10b175ce49
Fixes a race that occurred very frequently in testing where the tty of the container may be closed by the time that runc gets to sending SIGWINCH. This failure mode is not fatal, but it would cause test failures due to expected outputs not matching. On further review it appears that the original addition of these checks in4c5bf649d0("Check error return values") was actually not necessary, so partially revert that change. The particular failure mode this resolves would manifest as error logs of the form: time="2017-08-24T07:59:50Z" level=error msg="bad file descriptor" Fixes:4c5bf649d0("Check error return values") Signed-off-by: Aleksa Sarai <asarai@suse.de>
141 lines
3.5 KiB
Go
141 lines
3.5 KiB
Go
// +build linux
|
|
|
|
package main
|
|
|
|
import (
|
|
"os"
|
|
"os/signal"
|
|
"syscall" // only for Signal
|
|
|
|
"github.com/opencontainers/runc/libcontainer"
|
|
"github.com/opencontainers/runc/libcontainer/system"
|
|
"github.com/opencontainers/runc/libcontainer/utils"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
const signalBufferSize = 2048
|
|
|
|
// newSignalHandler returns a signal handler for processing SIGCHLD and SIGWINCH signals
|
|
// while still forwarding all other signals to the process.
|
|
// If notifySocket is present, use it to read systemd notifications from the container and
|
|
// forward them to notifySocketHost.
|
|
func newSignalHandler(enableSubreaper bool, notifySocket *notifySocket) *signalHandler {
|
|
if enableSubreaper {
|
|
// set us as the subreaper before registering the signal handler for the container
|
|
if err := system.SetSubreaper(1); err != nil {
|
|
logrus.Warn(err)
|
|
}
|
|
}
|
|
// ensure that we have a large buffer size so that we do not miss any signals
|
|
// incase we are not processing them fast enough.
|
|
s := make(chan os.Signal, signalBufferSize)
|
|
// handle all signals for the process.
|
|
signal.Notify(s)
|
|
return &signalHandler{
|
|
signals: s,
|
|
notifySocket: notifySocket,
|
|
}
|
|
}
|
|
|
|
// exit models a process exit status with the pid and
|
|
// exit status.
|
|
type exit struct {
|
|
pid int
|
|
status int
|
|
}
|
|
|
|
type signalHandler struct {
|
|
signals chan os.Signal
|
|
notifySocket *notifySocket
|
|
}
|
|
|
|
// forward handles the main signal event loop forwarding, resizing, or reaping depending
|
|
// on the signal received.
|
|
func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach bool) (int, error) {
|
|
// make sure we know the pid of our main process so that we can return
|
|
// after it dies.
|
|
if detach && h.notifySocket == nil {
|
|
return 0, nil
|
|
}
|
|
|
|
pid1, err := process.Pid()
|
|
if err != nil {
|
|
return -1, err
|
|
}
|
|
|
|
if h.notifySocket != nil {
|
|
if detach {
|
|
h.notifySocket.run(pid1)
|
|
return 0, nil
|
|
} else {
|
|
go h.notifySocket.run(0)
|
|
}
|
|
}
|
|
|
|
// Perform the initial tty resize. Always ignore errors resizing because
|
|
// stdout might have disappeared (due to races with when SIGHUP is sent).
|
|
_ = tty.resize()
|
|
// Handle and forward signals.
|
|
for s := range h.signals {
|
|
switch s {
|
|
case unix.SIGWINCH:
|
|
// Ignore errors resizing, as above.
|
|
_ = tty.resize()
|
|
case unix.SIGCHLD:
|
|
exits, err := h.reap()
|
|
if err != nil {
|
|
logrus.Error(err)
|
|
}
|
|
for _, e := range exits {
|
|
logrus.WithFields(logrus.Fields{
|
|
"pid": e.pid,
|
|
"status": e.status,
|
|
}).Debug("process exited")
|
|
if e.pid == pid1 {
|
|
// call Wait() on the process even though we already have the exit
|
|
// status because we must ensure that any of the go specific process
|
|
// fun such as flushing pipes are complete before we return.
|
|
process.Wait()
|
|
if h.notifySocket != nil {
|
|
h.notifySocket.Close()
|
|
}
|
|
return e.status, nil
|
|
}
|
|
}
|
|
default:
|
|
logrus.Debugf("sending signal to process %s", s)
|
|
if err := unix.Kill(pid1, s.(syscall.Signal)); err != nil {
|
|
logrus.Error(err)
|
|
}
|
|
}
|
|
}
|
|
return -1, nil
|
|
}
|
|
|
|
// reap runs wait4 in a loop until we have finished processing any existing exits
|
|
// then returns all exits to the main event loop for further processing.
|
|
func (h *signalHandler) reap() (exits []exit, err error) {
|
|
var (
|
|
ws unix.WaitStatus
|
|
rus unix.Rusage
|
|
)
|
|
for {
|
|
pid, err := unix.Wait4(-1, &ws, unix.WNOHANG, &rus)
|
|
if err != nil {
|
|
if err == unix.ECHILD {
|
|
return exits, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
if pid <= 0 {
|
|
return exits, nil
|
|
}
|
|
exits = append(exits, exit{
|
|
pid: pid,
|
|
status: utils.ExitStatus(ws),
|
|
})
|
|
}
|
|
}
|