Merge pull request #1150 from flyer103/release-1.10.0

cherry-pick #1149

pkg/microservice/reaper/executor/executor.go

@@ -59,7 +59,7 @@ func Execute() error {
 		//       operations, and wait for a fixed time.
 		//       Since `wd` will automatically delete the job after detecting the dogfile, this time has little
 		//       effect on the overall construction time.
-		time.Sleep(1 * time.Minute)
+		time.Sleep(30 * time.Second)
 	}()
 
 	var r *reaper.Reaper

pkg/microservice/warpdrive/core/service/taskplugin/build.go

@@ -366,19 +366,17 @@ func (p *BuildTaskPlugin) Complete(ctx context.Context, pipelineTask *task.Task,
 		PipelineType: string(pipelineTask.Type),
 	}
 
-	// 清理用户取消和超时的任务
+	// Clean up tasks that user canceled or timed out.
 	defer func() {
-		if err := ensureDeleteJob(p.KubeNamespace, jobLabel, p.kubeClient); err != nil {
-			p.Log.Error(err)
-			p.Task.Error = err.Error()
-		}
-
-		if err := ensureDeleteConfigMap(p.KubeNamespace, jobLabel, p.kubeClient); err != nil {
-			p.Log.Error(err)
-			p.Task.Error = err.Error()
-		}
+		go func() {
+			if err := ensureDeleteJob(p.KubeNamespace, jobLabel, p.kubeClient); err != nil {
+				p.Log.Error(err)
+			}
 
-		return
+			if err := ensureDeleteConfigMap(p.KubeNamespace, jobLabel, p.kubeClient); err != nil {
+				p.Log.Error(err)
+			}
+		}()
 	}()
 
 	err := saveContainerLog(pipelineTask, p.KubeNamespace, p.Task.ClusterID, p.FileName, jobLabel, p.kubeClient)

pkg/microservice/warpdrive/core/service/taskplugin/job.go

@@ -111,7 +111,7 @@ func saveContainerLog(pipelineTask *task.Task, namespace, clusterID, fileName st
 	}
 
 	if err := containerlog.GetContainerLogs(namespace, pods[0].Name, pods[0].Spec.Containers[0].Name, false, int64(0), buf, clientSet); err != nil {
-		return err
+		return fmt.Errorf("failed to get container logs: %s", err)
 	}
 
 	if tempFileName, err := util.GenerateTmpFile(); err == nil {

pkg/microservice/warpdrive/core/service/taskplugin/testing.go

@@ -303,17 +303,17 @@ func (p *TestPlugin) Complete(ctx context.Context, pipelineTask *task.Task, serv
 		PipelineType: string(pipelineTask.Type),
 	}
 
-	// 日志保存失败与否都清理job
+	// Clean up tasks that user canceled or timed out.
 	defer func() {
-		if err := ensureDeleteJob(p.KubeNamespace, jobLabel, p.kubeClient); err != nil {
-			p.Log.Error(err)
-			p.Task.Error = err.Error()
-		}
-		if err := ensureDeleteConfigMap(p.KubeNamespace, jobLabel, p.kubeClient); err != nil {
-			p.Log.Error(err)
-			p.Task.Error = err.Error()
-		}
-		return
+		go func() {
+			if err := ensureDeleteJob(p.KubeNamespace, jobLabel, p.kubeClient); err != nil {
+				p.Log.Error(err)
+			}
+
+			if err := ensureDeleteConfigMap(p.KubeNamespace, jobLabel, p.kubeClient); err != nil {
+				p.Log.Error(err)
+			}
+		}()
 	}()
 
 	err := saveContainerLog(pipelineTask, p.KubeNamespace, p.Task.ClusterID, p.FileName, jobLabel, p.kubeClient)