diff --git a/models/schedule_record.go b/models/schedule_record.go index 771e527e8..17963abb5 100755 --- a/models/schedule_record.go +++ b/models/schedule_record.go @@ -12,6 +12,7 @@ const ( StorageScheduleProcessing StorageScheduleFailed StorageNoFile + StorageScheduleWaiting ) type ScheduleRecord struct { diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go index dc96a33c4..ea73ef422 100755 --- a/routers/api/v1/repo/modelarts.go +++ b/routers/api/v1/repo/modelarts.go @@ -474,25 +474,25 @@ func ModelList(ctx *context.APIContext) { return } - if len(fileInfos) > 0 { - status = models.StorageScheduleSucceed - } else { - if models.IsTrainJobTerminal(task.Status) { - if task.Type == models.TypeC2Net { + if task.Type == models.TypeC2Net { + if len(fileInfos) > 0 { + status = models.StorageScheduleSucceed + } else { + if models.IsTrainJobTerminal(task.Status) { record, _ := models.GetScheduleRecordByCloudbrainID(task.ID) if record != nil { status = record.Status + if status == models.StorageScheduleSucceed { + status = models.StorageNoFile + } } else { status = models.StorageScheduleProcessing } } else { - status = models.StorageNoFile + status = models.StorageScheduleWaiting } - } else { - status = models.StorageScheduleProcessing } } - } else if task.ComputeResource == models.GPUResource { files, err := routerRepo.GetModelDirs(task.JobName, parentDir) if err != nil { @@ -507,16 +507,6 @@ func ModelList(ctx *context.APIContext) { ctx.ServerError("json.Unmarshal failed:", err) return } - - if len(fileInfos) > 0 { - status = models.StorageScheduleSucceed - } else { - if models.IsTrainJobTerminal(task.Status) { - status = models.StorageNoFile - } else { - status = models.StorageScheduleProcessing - } - } } ctx.JSON(http.StatusOK, map[string]interface{}{