Merge pull request #4918 from liusdu/sig_bus

crosbymichael · web-flow · commit abc0041a0e42 · 2021-01-12T15:52:57.000-05:00
signal: do not print message when dealing with SIG_PIPE
diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
@@ -45,12 +45,17 @@ func handleSignals(ctx context.Context, signals chan os.Signal, serverC chan *se
 			case s := <-serverC:
 				server = s
 			case s := <-signals:
+
+				// Do not print message when deailing with SIGPIPE, which may cause
+				// nested signals and consume lots of cpu bandwidth.
+				if s == unix.SIGPIPE {
+					continue
+				}
+
 				log.G(ctx).WithField("signal", s).Debug("received signal")
 				switch s {
 				case unix.SIGUSR1:
 					dumpStacks(true)
-				case unix.SIGPIPE:
-					continue
 				default:
 					if err := notifyStopping(ctx); err != nil {
 						log.G(ctx).WithError(err).Error("notify stopping failed")
