netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix watchdog skipStack: the meaning was reversed.

Browse Source 
PiperOrigin-RevId: 307166317
This commit is contained in:
Adin Scannell
2020-04-17 22:19:47 -07:00
committed by gVisor bot
parent e838290e67
commit 9a233c94f1
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sentry/watchdog/watchdog.go
+6 -7
View File
@@ -319,8 +319,8 @@ func (w *Watchdog) report(offenders map[*kernel.Task]*offender, newTaskFound boo
// Dump stack only if a new task is detected or if it sometime has
// passed since the last time a stack dump was generated.
skipStack := newTaskFound || time.Since(w.lastStackDump) >= stackDumpSameTaskPeriod
w.doAction(w.TaskTimeoutAction, skipStack, &buf)
showStack := newTaskFound || time.Since(w.lastStackDump) >= stackDumpSameTaskPeriod
w.doAction(w.TaskTimeoutAction, showStack, &buf)
}
func (w *Watchdog) reportStuckWatchdog() {
@@ -329,16 +329,15 @@ func (w *Watchdog) reportStuckWatchdog() {
w.doAction(w.TaskTimeoutAction, false, &buf)
}
// doAction will take the given action. If the action is LogWarnind and
// skipStack is true, then the stack printing will be skipped.
func (w *Watchdog) doAction(action Action, skipStack bool, msg *bytes.Buffer) {
// doAction will take the given action. If the action is LogWarning and
// showStack is false, then the stack printing will be skipped.
func (w *Watchdog) doAction(action Action, showStack bool, msg *bytes.Buffer) {
switch action {
case LogWarning:
if skipStack {
if !showStack {
msg.WriteString("\n...[stack dump skipped]...")
log.Warningf(msg.String())
return
}
log.TracebackAll(msg.String())
w.lastStackDump = time.Now()