diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-07-13 22:45:33 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-07-13 22:45:33 +0000 |
| commit | 8c414ae88acb5a734352ec384f83a9660289fed4 (patch) | |
| tree | 07d41da8c5a161654a3d73aac6ef7a40b35b6a65 /pkg | |
| parent | 7d62523796eb752643e3926dc87f1d0e65ed9a3c (diff) | |
| parent | 59a5479409094b141a60cfcc65f0a53d7871e2e1 (diff) | |
Merge release-20200622.1-108-g59a547940 (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/sentry/kernel/timekeeper.go | 3 | ||||
| -rw-r--r-- | pkg/sentry/time/parameters.go | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkg/sentry/kernel/timekeeper.go b/pkg/sentry/kernel/timekeeper.go index 0adf25691..5f3908d8b 100644 --- a/pkg/sentry/kernel/timekeeper.go +++ b/pkg/sentry/kernel/timekeeper.go @@ -210,9 +210,6 @@ func (t *Timekeeper) startUpdater() { p.realtimeBaseRef = int64(realtimeParams.BaseRef) p.realtimeFrequency = realtimeParams.Frequency } - - log.Debugf("Updating VDSO parameters: %+v", p) - return p }); err != nil { log.Warningf("Unable to update VDSO parameter page: %v", err) diff --git a/pkg/sentry/time/parameters.go b/pkg/sentry/time/parameters.go index 65868cb26..cd1b95117 100644 --- a/pkg/sentry/time/parameters.go +++ b/pkg/sentry/time/parameters.go @@ -228,11 +228,15 @@ func errorAdjust(prevParams Parameters, newParams Parameters, now TSCValue) (Par // // The log level is determined by the error severity. func logErrorAdjustment(clock ClockID, errorNS ReferenceNS, orig, adjusted Parameters) { - fn := log.Debugf - if int64(errorNS.Magnitude()) > time.Millisecond.Nanoseconds() { + magNS := int64(errorNS.Magnitude()) + if magNS <= 10*time.Microsecond.Nanoseconds() { + // Don't log small errors. + return + } + fn := log.Infof + if magNS > time.Millisecond.Nanoseconds() { + // Upgrade large errors to warning. fn = log.Warningf - } else if int64(errorNS.Magnitude()) > 10*time.Microsecond.Nanoseconds() { - fn = log.Infof } fn("Clock(%v): error: %v ns, adjusted frequency from %v Hz to %v Hz", clock, errorNS, orig.Frequency, adjusted.Frequency) |