From fc6c2f46de901f1d0e90e86c8aae6a344e6606b5 Mon Sep 17 00:00:00 2001
From: xuzhonghu <xuzhonghu@huawei.com>
Date: Thu, 18 Apr 2019 11:23:34 +0800
Subject: [PATCH] Abstract a common pod delete func

---
 pkg/controllers/job/job_controller_actions.go | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkg/controllers/job/job_controller_actions.go b/pkg/controllers/job/job_controller_actions.go
index 92cc3f6055..4b7729c6ff 100644
--- a/pkg/controllers/job/job_controller_actions.go
+++ b/pkg/controllers/job/job_controller_actions.go
@@ -68,40 +68,32 @@ func (cc *Controller) killJob(jobInfo *apis.JobInfo, nextState state.NextStateFn
 
 			switch pod.Status.Phase {
 			case v1.PodRunning:
-				err := cc.kubeClients.CoreV1().Pods(pod.Namespace).Delete(pod.Name, nil)
+				err := cc.deleteJobPod(job.Name, pod)
 				if err != nil {
 					running++
-					glog.Errorf("Failed to delete pod %s for Job %s, err %#v",
-						pod.Name, job.Name, err)
 					errs = append(errs, err)
 					continue
 				}
 				terminating++
 			case v1.PodPending:
-				err := cc.kubeClients.CoreV1().Pods(pod.Namespace).Delete(pod.Name, nil)
+				err := cc.deleteJobPod(job.Name, pod)
 				if err != nil {
 					pending++
-					glog.Errorf("Failed to delete pod %s for Job %s, err %#v",
-						pod.Name, job.Name, err)
 					errs = append(errs, err)
 					continue
 				}
 				terminating++
 			case v1.PodSucceeded:
-				err := cc.kubeClients.CoreV1().Pods(pod.Namespace).Delete(pod.Name, nil)
+				err := cc.deleteJobPod(job.Name, pod)
 				if err != nil {
 					succeeded++
-					glog.Errorf("Failed to delete pod %s for Job %s, err %#v",
-						pod.Name, job.Name, err)
 					errs = append(errs, err)
 					continue
 				}
 			case v1.PodFailed:
-				err := cc.kubeClients.CoreV1().Pods(pod.Namespace).Delete(pod.Name, nil)
+				err := cc.deleteJobPod(job.Name, pod)
 				if err != nil {
 					failed++
-					glog.Errorf("Failed to delete pod %s for Job %s, err %#v",
-						pod.Name, job.Name, err)
 					errs = append(errs, err)
 					continue
 				}
@@ -294,9 +286,9 @@ func (cc *Controller) syncJob(jobInfo *apis.JobInfo, nextState state.NextStateFn
 	for _, pod := range podToDelete {
 		go func(pod *v1.Pod) {
 			defer waitDeletionGroup.Done()
-			err := cc.kubeClients.CoreV1().Pods(pod.Namespace).Delete(pod.Name, nil)
+			err := cc.deleteJobPod(job.Name, pod)
 			if err != nil {
-				// Failed to create Pod, waitCreationGroup a moment and then create it again
+				// Failed to delete Pod, waitCreationGroup a moment and then create it again
 				// This is to ensure all podsMap under the same Job created
 				// So gang-scheduling could schedule the Job successfully
 				glog.Errorf("Failed to delete pod %s for Job %s, err %#v",
@@ -504,3 +496,15 @@ func (cc *Controller) createPodGroupIfNotExist(job *vkv1.Job) error {
 
 	return nil
 }
+
+func (cc *Controller) deleteJobPod(jobName string, pod *v1.Pod) error {
+	err := cc.kubeClients.CoreV1().Pods(pod.Namespace).Delete(pod.Name, nil)
+	if err != nil && !apierrors.IsNotFound(err) {
+		glog.Errorf("Failed to delete pod %s/%s for Job %s, err %#v",
+			pod.Namespace, pod.Name, jobName, err)
+
+		return err
+	}
+
+	return nil
+}