Merge pull request kubernetes-sigs#64 from droot/bug-fix/use-add-vs-rate-limited

k8s-ci-robot · web-flow · commit 3ac1302be001 · 2018-06-27T07:57:20.000-07:00
use Add instead of AddRateLimited in eventhandlers
diff --git a/pkg/handler/enqueue.go b/pkg/handler/enqueue.go
@@ -39,7 +39,7 @@ func (e *EnqueueRequestForObject) Create(evt event.CreateEvent, q workqueue.Rate
 		enqueueLog.Error(nil, "CreateEvent received with no metadata", "CreateEvent", evt)
 		return
 	}
-	q.AddRateLimited(reconcile.Request{NamespacedName: types.NamespacedName{
+	q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 		Name:      evt.Meta.GetName(),
 		Namespace: evt.Meta.GetNamespace(),
 	}})
@@ -48,7 +48,7 @@ func (e *EnqueueRequestForObject) Create(evt event.CreateEvent, q workqueue.Rate
 // Update implements EventHandler
 func (e *EnqueueRequestForObject) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) {
 	if evt.MetaOld != nil {
-		q.AddRateLimited(reconcile.Request{NamespacedName: types.NamespacedName{
+		q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 			Name:      evt.MetaOld.GetName(),
 			Namespace: evt.MetaOld.GetNamespace(),
 		}})
@@ -57,7 +57,7 @@ func (e *EnqueueRequestForObject) Update(evt event.UpdateEvent, q workqueue.Rate
 	}
 
 	if evt.MetaNew != nil {
-		q.AddRateLimited(reconcile.Request{NamespacedName: types.NamespacedName{
+		q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 			Name:      evt.MetaNew.GetName(),
 			Namespace: evt.MetaNew.GetNamespace(),
 		}})
@@ -72,7 +72,7 @@ func (e *EnqueueRequestForObject) Delete(evt event.DeleteEvent, q workqueue.Rate
 		enqueueLog.Error(nil, "DeleteEvent received with no metadata", "DeleteEvent", evt)
 		return
 	}
-	q.AddRateLimited(reconcile.Request{NamespacedName: types.NamespacedName{
+	q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 		Name:      evt.Meta.GetName(),
 		Namespace: evt.Meta.GetNamespace(),
 	}})
@@ -84,7 +84,7 @@ func (e *EnqueueRequestForObject) Generic(evt event.GenericEvent, q workqueue.Ra
 		enqueueLog.Error(nil, "GenericEvent received with no metadata", "GenericEvent", evt)
 		return
 	}
-	q.AddRateLimited(reconcile.Request{NamespacedName: types.NamespacedName{
+	q.Add(reconcile.Request{NamespacedName: types.NamespacedName{
 		Name:      evt.Meta.GetName(),
 		Namespace: evt.Meta.GetNamespace(),
 	}})
diff --git a/pkg/handler/enqueue_mapped.go b/pkg/handler/enqueue_mapped.go
@@ -64,7 +64,7 @@ func (e *EnqueueRequestsFromMapFunc) Generic(evt event.GenericEvent, q workqueue
 
 func (e *EnqueueRequestsFromMapFunc) mapAndEnqueue(q workqueue.RateLimitingInterface, object MapObject) {
 	for _, req := range e.ToRequests.Map(object) {
-		q.AddRateLimited(req)
+		q.Add(req)
 	}
 }
 
diff --git a/pkg/handler/enqueue_owner.go b/pkg/handler/enqueue_owner.go
@@ -56,31 +56,31 @@ type EnqueueRequestForOwner struct {
 // Create implements EventHandler
 func (e *EnqueueRequestForOwner) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) {
 	for _, req := range e.getOwnerReconcileRequest(evt.Meta) {
-		q.AddRateLimited(req)
+		q.Add(req)
 	}
 }
 
 // Update implements EventHandler
 func (e *EnqueueRequestForOwner) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) {
 	for _, req := range e.getOwnerReconcileRequest(evt.MetaOld) {
-		q.AddRateLimited(req)
+		q.Add(req)
 	}
 	for _, req := range e.getOwnerReconcileRequest(evt.MetaNew) {
-		q.AddRateLimited(req)
+		q.Add(req)
 	}
 }
 
 // Delete implements EventHandler
 func (e *EnqueueRequestForOwner) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) {
 	for _, req := range e.getOwnerReconcileRequest(evt.Meta) {
-		q.AddRateLimited(req)
+		q.Add(req)
 	}
 }
 
 // Generic implements EventHandler
 func (e *EnqueueRequestForOwner) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) {
 	for _, req := range e.getOwnerReconcileRequest(evt.Meta) {
-		q.AddRateLimited(req)
+		q.Add(req)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func (e *EnqueueRequestsFromMapFunc) Generic(evt event.GenericEvent, q workqueue`
`64`	`64`
`65`	`65`	`func (e *EnqueueRequestsFromMapFunc) mapAndEnqueue(q workqueue.RateLimitingInterface, object MapObject) {`
`66`	`66`	`for _, req := range e.ToRequests.Map(object) {`
`67`		`- q.AddRateLimited(req)`
	`67`	`+ q.Add(req)`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -56,31 +56,31 @@ type EnqueueRequestForOwner struct {`
`56`	`56`	`// Create implements EventHandler`
`57`	`57`	`func (e *EnqueueRequestForOwner) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) {`
`58`	`58`	`for _, req := range e.getOwnerReconcileRequest(evt.Meta) {`
`59`		`- q.AddRateLimited(req)`
	`59`	`+ q.Add(req)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`// Update implements EventHandler`
`64`	`64`	`func (e *EnqueueRequestForOwner) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) {`
`65`	`65`	`for _, req := range e.getOwnerReconcileRequest(evt.MetaOld) {`
`66`		`- q.AddRateLimited(req)`
	`66`	`+ q.Add(req)`
`67`	`67`	`}`
`68`	`68`	`for _, req := range e.getOwnerReconcileRequest(evt.MetaNew) {`
`69`		`- q.AddRateLimited(req)`
	`69`	`+ q.Add(req)`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Delete implements EventHandler`
`74`	`74`	`func (e *EnqueueRequestForOwner) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) {`
`75`	`75`	`for _, req := range e.getOwnerReconcileRequest(evt.Meta) {`
`76`		`- q.AddRateLimited(req)`
	`76`	`+ q.Add(req)`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// Generic implements EventHandler`
`81`	`81`	`func (e *EnqueueRequestForOwner) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) {`
`82`	`82`	`for _, req := range e.getOwnerReconcileRequest(evt.Meta) {`
`83`		`- q.AddRateLimited(req)`
	`83`	`+ q.Add(req)`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`