diff options
| author | gVisor bot <gvisor-bot@google.com> | 2019-12-03 21:46:24 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2019-12-03 21:46:24 +0000 |
| commit | 416c75a9628a86d3dfd20781c4339d96113b9c4e (patch) | |
| tree | 28c8febea050e8ab244b0bf920e8d684c365317b /pkg/sentry | |
| parent | a724a87ba326fef33896e2e5f4ab1c42510f026b (diff) | |
| parent | 154dcdec072ddad9e1c96b56e023d7f77fecf2ad (diff) | |
Merge release-20191114.0-53-g154dcde (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/watchdog/watchdog.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg/sentry/watchdog/watchdog.go b/pkg/sentry/watchdog/watchdog.go index ecce6c69f..5e4611333 100644 --- a/pkg/sentry/watchdog/watchdog.go +++ b/pkg/sentry/watchdog/watchdog.go @@ -287,7 +287,9 @@ func (w *Watchdog) runTurn() { if !ok { // New stuck task detected. // - // TODO(b/65849403): Tasks blocked doing IO may be considered stuck in kernel. + // Note that tasks blocked doing IO may be considered stuck in kernel, + // unless they are surrounded b + // Task.UninterruptibleSleepStart/Finish. tc = &offender{lastUpdateTime: lastUpdateTime} stuckTasks.Increment() newTaskFound = true |