From 392292ba81964e6ee7badec360a800b1f8645f2f Mon Sep 17 00:00:00 2001 From: wojtekt Date: Thu, 9 Sep 2021 16:38:59 +0200 Subject: [PATCH] Migratet to k8s.io/utils/clock in workqueue --- .../client-go/util/workqueue/delaying_queue.go | 6 +++--- .../client-go/util/workqueue/delaying_queue_test.go | 12 ++++++------ .../src/k8s.io/client-go/util/workqueue/metrics.go | 2 +- .../k8s.io/client-go/util/workqueue/metrics_test.go | 6 +++--- staging/src/k8s.io/client-go/util/workqueue/queue.go | 6 +++--- .../util/workqueue/rate_limiting_queue_test.go | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/staging/src/k8s.io/client-go/util/workqueue/delaying_queue.go b/staging/src/k8s.io/client-go/util/workqueue/delaying_queue.go index 31d9182dea6..61c4da530c0 100644 --- a/staging/src/k8s.io/client-go/util/workqueue/delaying_queue.go +++ b/staging/src/k8s.io/client-go/util/workqueue/delaying_queue.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/util/clock" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/utils/clock" ) // DelayingInterface is an Interface that can Add an item at a later time. This makes it easier to @@ -51,11 +51,11 @@ func NewNamedDelayingQueue(name string) DelayingInterface { // NewDelayingQueueWithCustomClock constructs a new named workqueue // with ability to inject real or fake clock for testing purposes -func NewDelayingQueueWithCustomClock(clock clock.Clock, name string) DelayingInterface { +func NewDelayingQueueWithCustomClock(clock clock.WithTicker, name string) DelayingInterface { return newDelayingQueue(clock, NewNamed(name), name) } -func newDelayingQueue(clock clock.Clock, q Interface, name string) *delayingType { +func newDelayingQueue(clock clock.WithTicker, q Interface, name string) *delayingType { ret := &delayingType{ Interface: q, clock: clock, diff --git a/staging/src/k8s.io/client-go/util/workqueue/delaying_queue_test.go b/staging/src/k8s.io/client-go/util/workqueue/delaying_queue_test.go index 2af8ba3a6a1..50d0c34d369 100644 --- a/staging/src/k8s.io/client-go/util/workqueue/delaying_queue_test.go +++ b/staging/src/k8s.io/client-go/util/workqueue/delaying_queue_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/wait" + testingclock "k8s.io/utils/clock/testing" ) func TestSimpleQueue(t *testing.T) { - fakeClock := clock.NewFakeClock(time.Now()) + fakeClock := testingclock.NewFakeClock(time.Now()) q := NewDelayingQueueWithCustomClock(fakeClock, "") first := "foo" @@ -70,7 +70,7 @@ func TestSimpleQueue(t *testing.T) { } func TestDeduping(t *testing.T) { - fakeClock := clock.NewFakeClock(time.Now()) + fakeClock := testingclock.NewFakeClock(time.Now()) q := NewDelayingQueueWithCustomClock(fakeClock, "") first := "foo" @@ -129,7 +129,7 @@ func TestDeduping(t *testing.T) { } func TestAddTwoFireEarly(t *testing.T) { - fakeClock := clock.NewFakeClock(time.Now()) + fakeClock := testingclock.NewFakeClock(time.Now()) q := NewDelayingQueueWithCustomClock(fakeClock, "") first := "foo" @@ -178,7 +178,7 @@ func TestAddTwoFireEarly(t *testing.T) { } func TestCopyShifting(t *testing.T) { - fakeClock := clock.NewFakeClock(time.Now()) + fakeClock := testingclock.NewFakeClock(time.Now()) q := NewDelayingQueueWithCustomClock(fakeClock, "") first := "foo" @@ -216,7 +216,7 @@ func TestCopyShifting(t *testing.T) { } func BenchmarkDelayingQueue_AddAfter(b *testing.B) { - fakeClock := clock.NewFakeClock(time.Now()) + fakeClock := testingclock.NewFakeClock(time.Now()) q := NewDelayingQueueWithCustomClock(fakeClock, "") // Add items diff --git a/staging/src/k8s.io/client-go/util/workqueue/metrics.go b/staging/src/k8s.io/client-go/util/workqueue/metrics.go index 556e6432eb1..4b0a69616d3 100644 --- a/staging/src/k8s.io/client-go/util/workqueue/metrics.go +++ b/staging/src/k8s.io/client-go/util/workqueue/metrics.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" ) // This file provides abstractions for setting the provider (e.g., prometheus) diff --git a/staging/src/k8s.io/client-go/util/workqueue/metrics_test.go b/staging/src/k8s.io/client-go/util/workqueue/metrics_test.go index e48cc38f53d..bfc9c1a3a6e 100644 --- a/staging/src/k8s.io/client-go/util/workqueue/metrics_test.go +++ b/staging/src/k8s.io/client-go/util/workqueue/metrics_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + testingclock "k8s.io/utils/clock/testing" ) type testMetrics struct { @@ -40,7 +40,7 @@ func TestMetricShutdown(t *testing.T) { m := &testMetrics{ updateCalled: ch, } - c := clock.NewFakeClock(time.Now()) + c := testingclock.NewFakeClock(time.Now()) q := newQueue(c, m, time.Millisecond) for !c.HasWaiters() { // Wait for the go routine to call NewTicker() @@ -170,7 +170,7 @@ func (m *testMetricsProvider) NewRetriesMetric(name string) CounterMetric { func TestMetrics(t *testing.T) { mp := testMetricsProvider{} t0 := time.Unix(0, 0) - c := clock.NewFakeClock(t0) + c := testingclock.NewFakeClock(t0) mf := queueMetricsFactory{metricsProvider: &mp} m := mf.newQueueMetrics("test", c) q := newQueue(c, m, time.Millisecond) diff --git a/staging/src/k8s.io/client-go/util/workqueue/queue.go b/staging/src/k8s.io/client-go/util/workqueue/queue.go index f7c14ddcdb5..19e2191a7e9 100644 --- a/staging/src/k8s.io/client-go/util/workqueue/queue.go +++ b/staging/src/k8s.io/client-go/util/workqueue/queue.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "k8s.io/apimachinery/pkg/util/clock" + "k8s.io/utils/clock" ) type Interface interface { @@ -46,7 +46,7 @@ func NewNamed(name string) *Type { ) } -func newQueue(c clock.Clock, metrics queueMetrics, updatePeriod time.Duration) *Type { +func newQueue(c clock.WithTicker, metrics queueMetrics, updatePeriod time.Duration) *Type { t := &Type{ clock: c, dirty: set{}, @@ -90,7 +90,7 @@ type Type struct { metrics queueMetrics unfinishedWorkUpdatePeriod time.Duration - clock clock.Clock + clock clock.WithTicker } type empty struct{} diff --git a/staging/src/k8s.io/client-go/util/workqueue/rate_limiting_queue_test.go b/staging/src/k8s.io/client-go/util/workqueue/rate_limiting_queue_test.go index 3fbe07d0d8b..84d8495dda3 100644 --- a/staging/src/k8s.io/client-go/util/workqueue/rate_limiting_queue_test.go +++ b/staging/src/k8s.io/client-go/util/workqueue/rate_limiting_queue_test.go @@ -20,13 +20,13 @@ import ( "testing" "time" - "k8s.io/apimachinery/pkg/util/clock" + testingclock "k8s.io/utils/clock/testing" ) func TestRateLimitingQueue(t *testing.T) { limiter := NewItemExponentialFailureRateLimiter(1*time.Millisecond, 1*time.Second) queue := NewRateLimitingQueue(limiter).(*rateLimitingType) - fakeClock := clock.NewFakeClock(time.Now()) + fakeClock := testingclock.NewFakeClock(time.Now()) delayingQueue := &delayingType{ Interface: New(), clock: fakeClock,