From 7f703c383e8229d5140f3c8958998c8f4d7d32f8 Mon Sep 17 00:00:00 2001 From: tzwang Date: Fri, 30 May 2025 10:06:10 +0800 Subject: [PATCH 1/2] updated openI execute --- internal/storeLink/openi.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/storeLink/openi.go b/internal/storeLink/openi.go index d4ccddc0..2d10b408 100644 --- a/internal/storeLink/openi.go +++ b/internal/storeLink/openi.go @@ -156,7 +156,7 @@ func (o *OpenI) Execute(ctx context.Context, option *option.AiOption, mode int) Send() if err != nil { - return nil, errors.New("failed to invoke TaskCreationRequired") + return nil, errors.New("failed to invoke TaskCreationRequired; " + err.Error()) } if len(resp.Data.Data.Specs.All) == 0 { From d637d3e75bd9087810c83330eda56ed89d03ab4e Mon Sep 17 00:00:00 2001 From: tzwang Date: Fri, 30 May 2025 10:08:01 +0800 Subject: [PATCH 2/2] updated statussync --- .../inference/createinferencetasklogic.go | 2 +- .../scheduler/service/utils/jcs/middleware.go | 17 ++++++----- .../service/utils/status/deployInstance.go | 12 ++++---- .../service/utils/status/statusSync.go | 29 ++++++++++++++----- 4 files changed, 38 insertions(+), 22 deletions(-) diff --git a/internal/logic/inference/createinferencetasklogic.go b/internal/logic/inference/createinferencetasklogic.go index ceccdb43..e868caab 100644 --- a/internal/logic/inference/createinferencetasklogic.go +++ b/internal/logic/inference/createinferencetasklogic.go @@ -80,7 +80,7 @@ func (l *CreateInferenceTaskLogic) CreateInferenceTask(req *types.CreateInferenc err = l.createInferenceTask(taskId, adapterClusterMap, opt) if err != nil { if len(assignedClusters) != 0 { - _ = status.ReportStatus(l.svcCtx, taskName, strconv.FormatInt(taskId, 10), assignedClusters[0].ClusterId, "", false, "") + _ = status.ReportInferenceStatusMessages(l.svcCtx, nil, taskName, strconv.FormatInt(taskId, 10), assignedClusters[0].ClusterId, "", false, "") logx.Errorf("############ Report Infer Task Status Message Error %s", err.Error()) } return nil, err diff --git a/internal/scheduler/service/utils/jcs/middleware.go b/internal/scheduler/service/utils/jcs/middleware.go index c0a6a78a..b8f20c55 100644 --- a/internal/scheduler/service/utils/jcs/middleware.go +++ b/internal/scheduler/service/utils/jcs/middleware.go @@ -24,13 +24,16 @@ type TrainReportMessage struct { Output string `json:"output"` } type InferReportMessage struct { - Type string `json:"type"` - TaskName string `json:"taskName"` - TaskID string `json:"taskID"` - Status bool `json:"status"` - Message string `json:"message"` - ClusterID string `json:"clusterID"` - Url string `json:"url"` + Type string `json:"type"` + TaskName string `json:"taskName"` + TaskID string `json:"taskID"` + Status bool `json:"status"` + Message string `json:"message"` + Url string `json:"url"` + ID string `json:"id"` + AdapterID string `json:"adapterId"` + ClusterID string `json:"clusterId"` + InstanceID string `json:"instanceId"` } func StatusReport(url string, report interface{}) error { diff --git a/internal/scheduler/service/utils/status/deployInstance.go b/internal/scheduler/service/utils/status/deployInstance.go index fb60d86e..8e550fb6 100644 --- a/internal/scheduler/service/utils/status/deployInstance.go +++ b/internal/scheduler/service/utils/status/deployInstance.go @@ -99,7 +99,7 @@ func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInfe return } url := ins.InferUrl - err := ReportStatus(svc, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), url, true, "") + err := ReportInferenceStatusMessages(svc, instance, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), url, true, "") if err != nil { logx.Errorf("############ Report Infer Task Status Message Error %s", err.Error()) } @@ -127,7 +127,7 @@ func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInfe return } url := ins.InferUrl - err := ReportStatus(svc, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), url, true, "") + err := ReportInferenceStatusMessages(svc, instance, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), url, true, "") if err != nil { logx.Errorf("############ Report Infer Task Status Message Error %s", err.Error()) } @@ -149,7 +149,7 @@ func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInfe } return } - err := ReportStatus(svc, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), "", false, ins.Status) + err := ReportInferenceStatusMessages(svc, instance, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), "", false, ins.Status) if err != nil { logx.Errorf("############ Report Infer Task Status Message Error %s", err.Error()) } @@ -191,7 +191,7 @@ func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInfe return } url := ins.InferUrl - err := ReportStatus(svc, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), url, true, "") + err := ReportInferenceStatusMessages(svc, instance, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), url, true, "") if err != nil { logx.Errorf("############ Report Infer Task Status Message Error %s", err.Error()) } @@ -213,7 +213,7 @@ func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInfe } return } - err := ReportStatus(svc, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), "", false, ins.Status) + err := ReportInferenceStatusMessages(svc, instance, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), "", false, ins.Status) if err != nil { logx.Errorf("############ Report Infer Task Status Message Error %s", err.Error()) } @@ -226,7 +226,7 @@ func UpdateDeployInstanceStatus(svc *svc.ServiceContext, instance *models.AiInfe } return } - err := ReportStatus(svc, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), "", false, ins.Status) + err := ReportInferenceStatusMessages(svc, instance, instance.InstanceName, strconv.FormatInt(instance.DeployInstanceTaskId, 10), strconv.FormatInt(instance.ClusterId, 10), "", false, ins.Status) if err != nil { logx.Errorf("############ Report Infer Task Status Message Error %s", err.Error()) } diff --git a/internal/scheduler/service/utils/status/statusSync.go b/internal/scheduler/service/utils/status/statusSync.go index 0afb3a75..6a14d9ab 100644 --- a/internal/scheduler/service/utils/status/statusSync.go +++ b/internal/scheduler/service/utils/status/statusSync.go @@ -226,16 +226,29 @@ func (s *TaskStatus) reportStatusMessages(task *types.TaskModel, aiTask *models. return nil } -func ReportStatus(svc *svc.ServiceContext, taskName string, taskId string, clusterId string, url string, status bool, msg string) error { +func ReportInferenceStatusMessages(svc *svc.ServiceContext, ins *models.AiInferDeployInstance, taskName string, taskId string, clusterId string, url string, status bool, msg string) error { + var id string + var adapterID string + var clusterID string + var instanceID string + if ins != nil { + id = strconv.FormatInt(ins.Id, 10) + adapterID = strconv.FormatInt(ins.AdapterId, 10) + clusterID = strconv.FormatInt(ins.ClusterId, 10) + instanceID = ins.InstanceId + } report := &jcs.JobStatusReportReq{} reportMsg := &jcs.InferReportMessage{ - Type: "Inference", - TaskName: taskName, - TaskID: taskId, - Status: status, - Message: msg, - ClusterID: clusterId, - Url: url, + Type: "Inference", + TaskName: taskName, + TaskID: taskId, + Status: status, + Message: msg, + Url: url, + ID: id, + AdapterID: adapterID, + ClusterID: clusterID, + InstanceID: instanceID, } report.Report = reportMsg