Merge branch 'master' into master

Author: elysium-w

pkg/controllers/cache/cache.go

@@ -273,11 +273,7 @@ func (jc *jobCache) TaskCompleted(jobKey, taskName string) bool {
 
 	taskPods, found := jobInfo.Pods[taskName]
 
-	if !found {
-		return false
-	}
-
-	if jobInfo.Job == nil {
+	if !found || jobInfo.Job == nil {
 		return false
 	}
 

pkg/controllers/job/job_controller_resync.go

@@ -43,14 +43,14 @@ func (cc *jobcontroller) processResyncTask() {
 		return
 	}
 
+	defer cc.errTasks.Done(obj)
+
 	// one task only resync 10 times
 	if cc.errTasks.NumRequeues(obj) > 10 {
 		cc.errTasks.Forget(obj)
 		return
 	}
 
-	defer cc.errTasks.Done(obj)
-
 	task, ok := obj.(*v1.Pod)
 	if !ok {
 		klog.Errorf("failed to convert %v to *v1.Pod", obj)