From 29432ce05476e3452b3afe0563d45bdc66ef8c27 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Mon, 20 Mar 2017 16:19:24 -0700 Subject: [PATCH] remove timed_queue, its functionality is supported by a regular queue now --- .../client-go/util/workqueue/timed_queue.go | 52 ------------------- .../util/workqueue/timed_queue_test.go | 38 -------------- vendor/BUILD | 3 -- 3 files changed, 93 deletions(-) delete mode 100644 staging/src/k8s.io/client-go/util/workqueue/timed_queue.go delete mode 100644 staging/src/k8s.io/client-go/util/workqueue/timed_queue_test.go diff --git a/staging/src/k8s.io/client-go/util/workqueue/timed_queue.go b/staging/src/k8s.io/client-go/util/workqueue/timed_queue.go deleted file mode 100644 index 2ad90bfdfc..0000000000 --- a/staging/src/k8s.io/client-go/util/workqueue/timed_queue.go +++ /dev/null @@ -1,52 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package workqueue - -import "time" - -type TimedWorkQueue struct { - *Type -} - -type TimedWorkQueueItem struct { - StartTime time.Time - Object interface{} -} - -func NewTimedWorkQueue() *TimedWorkQueue { - return &TimedWorkQueue{New()} -} - -// Add adds the obj along with the current timestamp to the queue. -func (q TimedWorkQueue) Add(timedItem *TimedWorkQueueItem) { - q.Type.Add(timedItem) -} - -// Get gets the obj along with its timestamp from the queue. -func (q TimedWorkQueue) Get() (timedItem *TimedWorkQueueItem, shutdown bool) { - origin, shutdown := q.Type.Get() - if origin == nil { - return nil, shutdown - } - timedItem, _ = origin.(*TimedWorkQueueItem) - return timedItem, shutdown -} - -func (q TimedWorkQueue) Done(timedItem *TimedWorkQueueItem) error { - q.Type.Done(timedItem) - return nil -} diff --git a/staging/src/k8s.io/client-go/util/workqueue/timed_queue_test.go b/staging/src/k8s.io/client-go/util/workqueue/timed_queue_test.go deleted file mode 100644 index 3498a4b8cc..0000000000 --- a/staging/src/k8s.io/client-go/util/workqueue/timed_queue_test.go +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2016 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package workqueue - -import ( - "testing" - "time" - - "k8s.io/client-go/pkg/api/v1" -) - -func TestNoMemoryLeak(t *testing.T) { - timedQueue := NewTimedWorkQueue() - timedQueue.Add(&TimedWorkQueueItem{Object: &v1.Pod{}, StartTime: time.Time{}}) - item, _ := timedQueue.Get() - timedQueue.Add(item) - // The item should still be in the timedQueue. - timedQueue.Done(item) - item, _ = timedQueue.Get() - timedQueue.Done(item) - if len(timedQueue.Type.processing) != 0 { - t.Errorf("expect timedQueue.Type.processing to be empty!") - } -} diff --git a/vendor/BUILD b/vendor/BUILD index 811973ee8f..b5affe6634 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -15146,13 +15146,11 @@ go_test( "k8s.io/client-go/util/workqueue/default_rate_limiters_test.go", "k8s.io/client-go/util/workqueue/delaying_queue_test.go", "k8s.io/client-go/util/workqueue/rate_limitting_queue_test.go", - "k8s.io/client-go/util/workqueue/timed_queue_test.go", ], library = ":k8s.io/client-go/util/workqueue", tags = ["automanaged"], deps = [ "//vendor:k8s.io/apimachinery/pkg/util/wait", - "//vendor:k8s.io/client-go/pkg/api/v1", "//vendor:k8s.io/client-go/util/clock", ], ) @@ -15167,7 +15165,6 @@ go_library( "k8s.io/client-go/util/workqueue/parallelizer.go", "k8s.io/client-go/util/workqueue/queue.go", "k8s.io/client-go/util/workqueue/rate_limitting_queue.go", - "k8s.io/client-go/util/workqueue/timed_queue.go", ], tags = ["automanaged"], deps = [