update statusReport

internal/scheduler/schedulers/aiScheduler.go

@@ -259,9 +259,9 @@ func (as *AiScheduler) handleErrors(errs []interface{}, clusters []*strategy.Ass
 
 		//report msg
 		report := &jcs.JobStatusReportReq{
-			JobSetID:   "",
-			LocalJobID: "",
-			Messages:   make([]*jcs.ReportMessage, 0),
+			TaskName: "",
+			TaskID:   strconv.FormatInt(taskId, 10),
+			Messages: make([]*jcs.ReportMessage, 0),
 		}
 
 		var errmsg string
@@ -282,11 +282,10 @@ func (as *AiScheduler) handleErrors(errs []interface{}, clusters []*strategy.Ass
 
 			//add report msg
 			jobMsg := &jcs.ReportMessage{
-				TaskName:  as.option.TaskName,
-				TaskID:    strconv.FormatInt(as.option.TaskId, 10),
 				Status:    false,
 				Message:   msg,
 				ClusterID: e.clusterId,
+				Output:    "",
 			}
 			report.Messages = append(report.Messages, jobMsg)
 		}
@@ -311,17 +310,18 @@ func (as *AiScheduler) handleErrors(errs []interface{}, clusters []*strategy.Ass
 			}
 			//add report msg
 			jobMsg := &jcs.ReportMessage{
-				TaskName:  as.option.TaskName,
-				TaskID:    strconv.FormatInt(as.option.TaskId, 10),
 				Status:    false,
 				Message:   s.Msg,
 				ClusterID: s.ClusterId,
+				Output:    "",
 			}
 			report.Messages = append(report.Messages, jobMsg)
 		}
 
 		//report status
-		_ = jcs.StatusReport(as.AiService.Conf.JcsMiddleware.Url, report)
+		if mode == executor.SUBMIT_MODE_STORAGE_SCHEDULE {
+			_ = jcs.StatusReport(as.AiService.Conf.JcsMiddleware.Url, report)
+		}
 
 		logx.Errorf(errors.New(errmsg).Error())
 		return errors.New(errmsg)

internal/scheduler/service/utils/jcs/middleware.go

@@ -5,13 +5,11 @@ import (
 )
 
 type JobStatusReportReq struct {
-	JobSetID   string           `json:"jobSetID"`
-	LocalJobID string           `json:"localJobID"`
-	Messages   []*ReportMessage `json:"messages"`
+	TaskName string           `json:"taskName"`
+	TaskID   string           `json:"taskID"`
+	Messages []*ReportMessage `json:"messages"`
 }
 type ReportMessage struct {
-	TaskName  string `json:"taskName"`
-	TaskID    string `json:"taskID"`
 	Status    bool   `json:"status"`
 	Message   string `json:"message"`
 	ClusterID string `json:"clusterID"`

internal/scheduler/service/utils/status/taskStatusSync.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
+	"gitlink.org.cn/JointCloud/pcm-coordinator/internal/scheduler/service/utils/jcs"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/internal/svc"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/internal/types"
 	"gitlink.org.cn/JointCloud/pcm-coordinator/pkg/constants"
@@ -61,6 +62,7 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
 	if len(aiTask) == 1 {
 		if aiTask[0].Status == constants.Completed {
 			task.Status = constants.Succeeded
+			_ = reportStatusMessages(svc, task, aiTask[0])
 		} else {
 			task.Status = aiTask[0].Status
 		}
@@ -142,6 +144,26 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
 	}
 }
 
+func reportStatusMessages(svc *svc.ServiceContext, task *types.TaskModel, aiTask *models.TaskAi) error {
+	report := &jcs.JobStatusReportReq{
+		TaskName: task.Name,
+		TaskID:   strconv.FormatInt(task.Id, 10),
+		Messages: make([]*jcs.ReportMessage, 0),
+	}
+	//add report msg
+	jobMsg := &jcs.ReportMessage{
+		Status:    true,
+		Message:   "",
+		ClusterID: strconv.FormatInt(aiTask.ClusterId, 10),
+		Output:    aiTask.JobId,
+	}
+	report.Messages = append(report.Messages, jobMsg)
+
+	_ = jcs.StatusReport(svc.Scheduler.AiService.Conf.JcsMiddleware.Url, report)
+
+	return nil
+}
+
 func updateInferTaskStatus(svc *svc.ServiceContext, task types.TaskModel) {
 	aiTask, err := svc.Scheduler.AiStorages.GetAiTaskListById(task.Id)
 	if err != nil {