diff --git a/pkg/kubelet/util/queue/work_queue.go b/pkg/kubelet/util/queue/work_queue.go index 97ab440b79c..6870c18ace2 100644 --- a/pkg/kubelet/util/queue/work_queue.go +++ b/pkg/kubelet/util/queue/work_queue.go @@ -29,8 +29,7 @@ import ( type WorkQueue interface { // GetWork dequeues and returns all ready items. GetWork() []types.UID - // Enqueue inserts a new item or overwrites an existing item with the - // new timestamp (time.Now() + delay) if it is greater. + // Enqueue inserts a new item or overwrites an existing item. Enqueue(item types.UID, delay time.Duration) } @@ -64,10 +63,5 @@ func (q *basicWorkQueue) GetWork() []types.UID { func (q *basicWorkQueue) Enqueue(item types.UID, delay time.Duration) { q.lock.Lock() defer q.lock.Unlock() - now := q.clock.Now() - timestamp := now.Add(delay) - existing, ok := q.queue[item] - if !ok || (ok && existing.Before(timestamp)) { - q.queue[item] = timestamp - } + q.queue[item] = q.clock.Now().Add(delay) } diff --git a/pkg/kubelet/util/queue/work_queue_test.go b/pkg/kubelet/util/queue/work_queue_test.go index f105b037321..6dd452a9112 100644 --- a/pkg/kubelet/util/queue/work_queue_test.go +++ b/pkg/kubelet/util/queue/work_queue_test.go @@ -63,15 +63,3 @@ func TestGetWork(t *testing.T) { compareResults(t, expected, q.GetWork()) compareResults(t, []types.UID{}, q.GetWork()) } - -func TestEnqueueKeepGreaterTimestamp(t *testing.T) { - q, _ := newTestBasicWorkQueue() - item := types.UID("foo") - q.Enqueue(item, -7*time.Hour) - q.Enqueue(item, 3*time.Hour) - compareResults(t, []types.UID{}, q.GetWork()) - - q.Enqueue(item, 3*time.Hour) - q.Enqueue(item, -7*time.Hour) - compareResults(t, []types.UID{}, q.GetWork()) -}