Merge pull request #2188 from crosbymichael/sigpiper

estesp · web-flow · commit 015bdb7ccec7 · 2018-03-06T16:24:49.000-05:00
[release 1.0] Handle SIGPIPE in shims
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -192,6 +192,7 @@ func handleSignals(logger *logrus.Entry, signals chan os.Signal, server *ttrpc.S
 					sv.Delete(context.Background(), &ptypes.Empty{})
 					close(done)
 				})
+			case unix.SIGPIPE:
 			}
 		}
 	}
diff --git a/cmd/containerd-shim/shim_linux.go b/cmd/containerd-shim/shim_linux.go
@@ -3,19 +3,19 @@ package main
 import (
 	"os"
 	"os/signal"
-	"syscall"
 
 	"github.com/containerd/containerd/reaper"
 	"github.com/containerd/containerd/sys"
 	runc "github.com/containerd/go-runc"
 	"github.com/stevvooe/ttrpc"
+	"golang.org/x/sys/unix"
 )
 
 // setupSignals creates a new signal handler for all signals and sets the shim as a
 // sub-reaper so that the container processes are reparented
 func setupSignals() (chan os.Signal, error) {
 	signals := make(chan os.Signal, 32)
-	signal.Notify(signals, syscall.SIGTERM, syscall.SIGINT, syscall.SIGCHLD)
+	signal.Notify(signals, unix.SIGTERM, unix.SIGINT, unix.SIGCHLD, unix.SIGPIPE)
 	// make sure runc is setup to use the monitor
 	// for waiting on processes
 	runc.Monitor = reaper.Default

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,7 @@ func handleSignals(logger logrus.Entry, signals chan os.Signal, server ttrpc.S`
`192`	`192`	`sv.Delete(context.Background(), &ptypes.Empty{})`
`193`	`193`	`close(done)`
`194`	`194`	`})`
	`195`	`+ case unix.SIGPIPE:`
`195`	`196`	`}`
`196`	`197`	`}`
`197`	`198`	`}`