Don't write dumped stacks to file for ETW capture state

kevpar · kevpar · commit 0376dd4605ab · 2019-04-19T10:11:24.000-07:00
Signed-off-by: Kevin Parsons &lt;kevpar@microsoft.com&gt;
diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
@@ -278,7 +278,7 @@ func setLevel(context *cli.Context, config *srvconfig.Config) error {
 	return nil
 }
 
-func dumpStacks() {
+func dumpStacks(writeToFile bool) {
 	var (
 		buf       []byte
 		stackSize int
@@ -292,13 +292,15 @@ func dumpStacks() {
 	buf = buf[:stackSize]
 	logrus.Infof("=== BEGIN goroutine stack dump ===\n%s\n=== END goroutine stack dump ===", buf)
 
-	// Also write to file to aid gathering diagnostics
-	name := filepath.Join(os.TempDir(), fmt.Sprintf("containerd.%d.stacks.log", os.Getpid()))
-	f, err := os.Create(name)
-	if err != nil {
-		return
+	if writeToFile {
+		// Also write to file to aid gathering diagnostics
+		name := filepath.Join(os.TempDir(), fmt.Sprintf("containerd.%d.stacks.log", os.Getpid()))
+		f, err := os.Create(name)
+		if err != nil {
+			return
+		}
+		defer f.Close()
+		f.WriteString(string(buf))
+		logrus.Infof("goroutine stack dump written to %s", name)
 	}
-	defer f.Close()
-	f.WriteString(string(buf))
-	logrus.Infof("goroutine stack dump written to %s", name)
 }
diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
@@ -48,7 +48,7 @@ func handleSignals(ctx context.Context, signals chan os.Signal, serverC chan *se
 				log.G(ctx).WithField("signal", s).Debug("received signal")
 				switch s {
 				case unix.SIGUSR1:
-					dumpStacks()
+					dumpStacks(true)
 				case unix.SIGPIPE:
 					continue
 				default:
diff --git a/cmd/containerd/command/main_windows.go b/cmd/containerd/command/main_windows.go
@@ -88,14 +88,14 @@ func setupDumpStacks() {
 		logrus.Debugf("Stackdump - waiting signal at %s", event)
 		for {
 			windows.WaitForSingleObject(h, windows.INFINITE)
-			dumpStacks()
+			dumpStacks(true)
 		}
 	}()
 }
 
 func etwCallback(sourceID *guid.GUID, state etw.ProviderState, level etw.Level, matchAnyKeyword uint64, matchAllKeyword uint64, filterData uintptr) {
 	if state == etw.ProviderStateCaptureState {
-		dumpStacks()
+		dumpStacks(false)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,14 @@ func setupDumpStacks() {`
`88`	`88`	`logrus.Debugf("Stackdump - waiting signal at %s", event)`
`89`	`89`	`for {`
`90`	`90`	`windows.WaitForSingleObject(h, windows.INFINITE)`
`91`		`- dumpStacks()`
	`91`	`+ dumpStacks(true)`
`92`	`92`	`}`
`93`	`93`	`}()`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`func etwCallback(sourceID *guid.GUID, state etw.ProviderState, level etw.Level, matchAnyKeyword uint64, matchAllKeyword uint64, filterData uintptr) {`
`97`	`97`	`if state == etw.ProviderStateCaptureState {`
`98`		`- dumpStacks()`
	`98`	`+ dumpStacks(false)`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`