From e10acc78dee5d90d93fc7bc0e76e97bc7bc0b3a3 Mon Sep 17 00:00:00 2001 From: Mike Spreitzer Date: Wed, 13 Nov 2019 09:20:00 -0500 Subject: [PATCH] Fixed lint and staticcheck oversights --- .../pkg/util/flowcontrol/fairqueuing/queueset/queueset.go | 2 ++ .../pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go | 2 -- .../apiserver/pkg/util/promise/lockingpromise/lockingpromise.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go index e71870a7481..fe311a9e2c1 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go @@ -34,6 +34,8 @@ import ( "k8s.io/klog" ) +const nsTimeFmt = "2006-01-02 15:04:05.000000000" + // queueSetFactory implements the QueueSetFactory interface // queueSetFactory makes QueueSet objects. type queueSetFactory struct { diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go index 17cd5fa1b0a..f8d0735ed6a 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset_test.go @@ -42,8 +42,6 @@ type uniformClient struct { thinkDuration time.Duration } -const nsTimeFmt = "2006-01-02 15:04:05.000000000" - // exerciseQueueSetUniformScenario runs a scenario based on the given set of uniform clients. // Each uniform client specifies a number of threads, each of which alternates between thinking // and making a synchronous request through the QueueSet. diff --git a/staging/src/k8s.io/apiserver/pkg/util/promise/lockingpromise/lockingpromise.go b/staging/src/k8s.io/apiserver/pkg/util/promise/lockingpromise/lockingpromise.go index c89e0101ec3..a449df2c788 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/promise/lockingpromise/lockingpromise.go +++ b/staging/src/k8s.io/apiserver/pkg/util/promise/lockingpromise/lockingpromise.go @@ -38,6 +38,7 @@ type lockingPromise struct { var _ promise.LockingMutable = &lockingPromise{} +// NewLockingPromise makes a new promise.LockingMutable func NewLockingPromise(lock sync.Locker, activeCounter counter.GoRoutineCounter) promise.LockingMutable { return &lockingPromise{ lock: lock,