Browse Source

update taskStatusSync

pull/437/head
tzwang 8 months ago
parent
commit
6a249ff23e
4 changed files with 11 additions and 6 deletions
  1. +1
    -1
      etc/pcm.yaml
  2. +1
    -1
      internal/config/config.go
  3. +1
    -1
      internal/scheduler/schedulers/aiScheduler.go
  4. +8
    -3
      internal/scheduler/service/utils/status/taskStatusSync.go

+ 1
- 1
etc/pcm.yaml View File

@@ -84,4 +84,4 @@ BlockChain:
Type: "2" Type: "2"


JcsMiddleware: JcsMiddleware:
Url: 101.201.215.196:7891
JobStatusReportUrl: 101.201.215.196:7891/jobSet/jobStatusReport

+ 1
- 1
internal/config/config.go View File

@@ -65,5 +65,5 @@ type SnowflakeConf struct {
} }


type JcsMiddleware struct { type JcsMiddleware struct {
Url string
JobStatusReportUrl string
} }

+ 1
- 1
internal/scheduler/schedulers/aiScheduler.go View File

@@ -320,7 +320,7 @@ func (as *AiScheduler) handleErrors(errs []interface{}, clusters []*strategy.Ass


//report status //report status
if mode == executor.SUBMIT_MODE_STORAGE_SCHEDULE { if mode == executor.SUBMIT_MODE_STORAGE_SCHEDULE {
_ = jcs.StatusReport(as.AiService.Conf.JcsMiddleware.Url, report)
_ = jcs.StatusReport(as.AiService.Conf.JcsMiddleware.JobStatusReportUrl, report)
} }


logx.Errorf(errors.New(errmsg).Error()) logx.Errorf(errors.New(errmsg).Error())


+ 8
- 3
internal/scheduler/service/utils/status/taskStatusSync.go View File

@@ -60,12 +60,17 @@ func UpdateTaskStatus(svc *svc.ServiceContext, tasklist []*types.TaskModel) {
} }


if len(aiTask) == 1 { if len(aiTask) == 1 {
if aiTask[0].Status == constants.Completed {
switch aiTask[0].Status {
case constants.Completed:
task.Status = constants.Succeeded task.Status = constants.Succeeded
_ = reportStatusMessages(svc, task, aiTask[0]) _ = reportStatusMessages(svc, task, aiTask[0])
} else {
case constants.Failed:
task.Status = constants.Failed
_ = reportStatusMessages(svc, task, aiTask[0])
default:
task.Status = aiTask[0].Status task.Status = aiTask[0].Status
} }

task.StartTime = aiTask[0].StartTime task.StartTime = aiTask[0].StartTime
task.EndTime = aiTask[0].EndTime task.EndTime = aiTask[0].EndTime
err := svc.Scheduler.AiStorages.UpdateTask(task) err := svc.Scheduler.AiStorages.UpdateTask(task)
@@ -159,7 +164,7 @@ func reportStatusMessages(svc *svc.ServiceContext, task *types.TaskModel, aiTask
} }
report.Messages = append(report.Messages, jobMsg) report.Messages = append(report.Messages, jobMsg)


_ = jcs.StatusReport(svc.Scheduler.AiService.Conf.JcsMiddleware.Url, report)
_ = jcs.StatusReport(svc.Scheduler.AiService.Conf.JcsMiddleware.JobStatusReportUrl, report)


return nil return nil
} }


Loading…
Cancel
Save