diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-11-14 02:14:09 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-11-14 02:14:09 +0000 |
| commit | 8033d1baf17cde8fbb9f57e48904d2d96c4c920b (patch) | |
| tree | 6778888dd083b08848b3342eef8027657b631a73 /pkg/sentry/watchdog | |
| parent | d993a110370df43fb21ec6a5dfebcbc63f4d819b (diff) | |
| parent | 182c126013a28f19594ff61326f1f9a2c481f1b4 (diff) | |
Merge release-20201030.0-96-g182c12601 (automated)
Diffstat (limited to 'pkg/sentry/watchdog')
| -rw-r--r-- | pkg/sentry/watchdog/watchdog.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkg/sentry/watchdog/watchdog.go b/pkg/sentry/watchdog/watchdog.go index bbafb8b7f..1d1062aeb 100644 --- a/pkg/sentry/watchdog/watchdog.go +++ b/pkg/sentry/watchdog/watchdog.go @@ -336,11 +336,9 @@ func (w *Watchdog) report(offenders map[*kernel.Task]*offender, newTaskFound boo buf.WriteString(fmt.Sprintf("Sentry detected %d stuck task(s):\n", len(offenders))) for t, o := range offenders { tid := w.k.TaskSet().Root.IDOfTask(t) - buf.WriteString(fmt.Sprintf("\tTask tid: %v (%#x), entered RunSys state %v ago.\n", tid, uint64(tid), now.Sub(o.lastUpdateTime))) + buf.WriteString(fmt.Sprintf("\tTask tid: %v (goroutine %d), entered RunSys state %v ago.\n", tid, t.GoroutineID(), now.Sub(o.lastUpdateTime))) } - buf.WriteString("Search for '(*Task).run(0x..., 0x<tid>)' in the stack dump to find the offending goroutine") - // Force stack dump only if a new task is detected. w.doAction(w.TaskTimeoutAction, newTaskFound, &buf) } |