From a4281989c31d0f19cf204d50560548057f947b09 Mon Sep 17 00:00:00 2001 From: hongming Date: Fri, 20 Sep 2019 20:58:19 +0800 Subject: [PATCH] fix: controller error handle function Signed-off-by: hongming --- pkg/controller/application/application_controller.go | 2 +- pkg/controller/destinationrule/destinationrule_controller.go | 2 +- pkg/controller/job/job_controller.go | 3 ++- pkg/controller/virtualservice/virtualservice_controller.go | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/controller/application/application_controller.go b/pkg/controller/application/application_controller.go index aa5223565..f1b7e4483 100644 --- a/pkg/controller/application/application_controller.go +++ b/pkg/controller/application/application_controller.go @@ -242,7 +242,7 @@ func (v *ApplicationController) enqueueObject(obj interface{}) { } func (v *ApplicationController) handleErr(err error, key interface{}) { - if err != nil { + if err == nil { v.queue.Forget(key) return } diff --git a/pkg/controller/destinationrule/destinationrule_controller.go b/pkg/controller/destinationrule/destinationrule_controller.go index 756c5c8ba..8dd36aa88 100644 --- a/pkg/controller/destinationrule/destinationrule_controller.go +++ b/pkg/controller/destinationrule/destinationrule_controller.go @@ -471,7 +471,7 @@ func (v *DestinationRuleController) addServicePolicy(obj interface{}) { } func (v *DestinationRuleController) handleErr(err error, key interface{}) { - if err != nil { + if err == nil { v.queue.Forget(key) return } diff --git a/pkg/controller/job/job_controller.go b/pkg/controller/job/job_controller.go index ab33d81d6..07972f3b4 100644 --- a/pkg/controller/job/job_controller.go +++ b/pkg/controller/job/job_controller.go @@ -170,6 +170,7 @@ func (v *JobController) syncJob(key string) error { if err != nil { log.Error(err, "make job revision failed", "namespace", namespace, "name", name) + return err } return nil @@ -186,7 +187,7 @@ func (v *JobController) addJob(obj interface{}) { } func (v *JobController) handleErr(err error, key interface{}) { - if err != nil { + if err == nil { v.queue.Forget(key) return } diff --git a/pkg/controller/virtualservice/virtualservice_controller.go b/pkg/controller/virtualservice/virtualservice_controller.go index d6a29d119..8c22c9a96 100644 --- a/pkg/controller/virtualservice/virtualservice_controller.go +++ b/pkg/controller/virtualservice/virtualservice_controller.go @@ -484,7 +484,7 @@ func (v *VirtualServiceController) addStrategy(obj interface{}) { } func (v *VirtualServiceController) handleErr(err error, key interface{}) { - if err != nil { + if err == nil { v.queue.Forget(key) return }