models/model_migrate_record.go

@@ -160,8 +160,8 @@ func RollBackMigrateStatus(record *ModelMigrateRecord, newStep ModelMigrateStep)
 }
 
 func UpdateModelMigrateRecordByStep(record *ModelMigrateRecord) error {
-	n, err := x.Where(builder.NewCond().And(builder.Eq{"id": record.ID}).
-		And(builder.Lt{"current_step": record.CurrentStep})).
+	n, err := x.
+		Where(builder.NewCond().And(builder.Eq{"id": record.ID})).
 		Update(record)
 	if err != nil {
 		log.Error("UpdateModelMigrateRecordByStep err. ID=%d  err=%v", record.ID, err)

services/ai_task_service/schedule/model_schedule.go

@@ -231,10 +231,11 @@ func TryToUpdateNPUMoveBucketResult(record *models.ModelMigrateRecord, jobName,
 }
 
 func updateModelMigrateFromRes(r *models.ModelMigrateRecord, res *models.GrampusModelMigrateInfoResponse) error {
-	r.CurrentStep = models.GrampusMigrateResponse(res.Status).ConvertToModelMigrateStep()
-	r.Status = r.CurrentStep.GetStatus()
-	if r.Status < 0 {
-		log.Error("updateModelMigrateFromRes current_step not valid..id=%d.current_step=%v", r.ID, res.Status)
+	step := models.GrampusMigrateResponse(res.Status).ConvertToModelMigrateStep()
+	err := models.UpdateModelMigrateStatusByStep(r, step)
+	if err != nil {
+		log.Error("UpdateModelMigrateStatusByStep err,ID=%d err=%v", r.ID, err)
+		return err
 	}
 	r.DestBucket = res.DestBucket
 	r.DestEndpoint = res.DestEndpoint
@@ -244,7 +245,7 @@ func updateModelMigrateFromRes(r *models.ModelMigrateRecord, res *models.Grampus
 	r.SrcBucket = res.SrcBucket
 	r.SrcEndpoint = res.SrcEndpoint
 	r.SrcObjectKey = res.SrcObjectKey
-	err := models.UpdateModelMigrateRecordByStep(r)
+	err = models.UpdateModelMigrateRecordByStep(r)
 	if err != nil {
 		log.Error("updateModelMigrateFromRes UpdateModelMigrateRecord error.id=%d.err=%v", r.ID, err)
 		return err