vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #619 from crosbymichael/no-shim

Browse source 
Add `no_shim` config for not running with a shim
This commit is contained in:
Michael Crosby 2017-03-22 13:49:03 -07:00 • committed by GitHub
commit 5e5479718c
9 changed files with 199 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

22
cmd/containerd-shim/main.go
View file

@ -57,16 +57,20 @@ func main() {
if err := setupRoot(); err != nil {
return err
}
path, err := os.Getwd()
if err != nil {
return err
}
var (
server = grpc.NewServer()
sv = shim.New()
sv = shim.New(path)
)
logrus.Debug("registering grpc server")
shimapi.RegisterShimServer(server, sv)
if err := serve(server, "shim.sock"); err != nil {
return err
}
return handleSignals(signals, server, sv)
return handleSignals(signals, server)
}
if err := app.Run(os.Args); err != nil {
fmt.Fprintf(os.Stderr, "containerd-shim: %s\n", err)
@ -107,24 +111,14 @@ func serve(server *grpc.Server, path string) error {
return nil
}
func handleSignals(signals chan os.Signal, server *grpc.Server, service *shim.Service) error {
func handleSignals(signals chan os.Signal, server *grpc.Server) error {
for s := range signals {
logrus.WithField("signal", s).Debug("received signal")
switch s {
case syscall.SIGCHLD:
exits, err := reaper.Reap()
if err != nil {
if err := reaper.Reap(); err != nil {
logrus.WithError(err).Error("reap exit status")
}
for _, e := range exits {
logrus.WithFields(logrus.Fields{
"status": e.Status,
"pid": e.Pid,
}).Debug("process exited")
if err := service.ProcessExit(e); err != nil {
return err
}
}
case syscall.SIGTERM, syscall.SIGINT:
// TODO: should we forward signals to the processes if they are still running?
// i.e. machine reboot

2
cmd/containerd/main.go
View file

@ -409,7 +409,7 @@ func handleSignals(signals chan os.Signal, server *grpc.Server) error {
log.G(global).WithField("signal", s).Debug("received signal")
switch s {
case syscall.SIGCHLD:
if _, err := reaper.Reap(); err != nil {
if err := reaper.Reap(); err != nil {
log.G(global).WithError(err).Error("reap containerd processes")
}
default: