Merge pull request volcano-sh#15 from k82cn/fixed_e2e

pkg/controllers/job/cache/cache.go

@@ -178,12 +178,12 @@ func (jc *jobCache) Delete(obj *v1alpha1.Job) error {
 	defer jc.Unlock()
 
 	key := JobKey(obj)
-	if _, found := jc.jobs[key]; !found {
+	if jobInfo, found := jc.jobs[key]; !found {
 		return fmt.Errorf("failed to find job <%v>", key)
+	} else {
+		jc.deleteJob(jobInfo)
 	}
 
-	delete(jc.jobs, key)
-
 	return nil
 }
 
@@ -279,6 +279,8 @@ func (jc *jobCache) DeletePod(pod *v1.Pod) error {
 		delete(pods, pod.Name)
 	}
 
+	jc.deleteJob(job)
+
 	return nil
 }
 
@@ -326,7 +328,7 @@ func (jc *jobCache) deleteJob(job *apis.JobInfo) {
 	glog.V(3).Infof("Try to delete Job <%v/%v>",
 		job.Job.Namespace, job.Job.Name)
 
-	time.AfterFunc(5*time.Second, func() {
+	time.AfterFunc(1*time.Second, func() {
 		jc.deletedJobs.AddIfNotPresent(job)
 	})
 }

test/e2e/util.go

@@ -247,6 +247,7 @@ func deleteQueues(cxt *context) {
 }
 
 type taskSpec struct {
+	name     string
 	min, rep int32
 	img      string
 	hostport int32
@@ -288,8 +289,15 @@ func createJob(context *context, jobSpec *jobSpec) *vkv1.Job {
 	}
 
 	var min int32
-	for _, task := range jobSpec.tasks {
+	for i, task := range jobSpec.tasks {
+		name := task.name
+
+		if len(name) == 0 {
+			name = fmt.Sprintf("%s-task-%d", jobSpec.name, i)
+		}
+
 		ts := vkv1.TaskSpec{
+			Name:     name,
 			Replicas: task.rep,
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{