Browse Source

Merge branch 'fix-2026' of https://git.openi.org.cn/OpenI/aiforge into fix-2026

pull/2292/head
liuzx 3 years ago
parent
commit
a5dfb5686a
2 changed files with 13 additions and 1 deletions
  1. +4
    -0
      models/cloudbrain.go
  2. +9
    -1
      routers/repo/cloudbrain.go

+ 4
- 0
models/cloudbrain.go View File

@@ -1559,6 +1559,10 @@ func GetStoppedJobWithNoDurationJob() ([]*Cloudbrain, error) {
Limit(100). Limit(100).
Find(&cloudbrains) Find(&cloudbrains)
} }
func GetStoppedJobWithNoStartTimeEndTime() ([]*Cloudbrain, error) {
cloudbrains := make([]*Cloudbrain, 0)
return cloudbrains, x.SQL("select * from cloudbrain where status in (?,?,?,?,?,?,?) and (start_time is null or end_time is null) limit 100", ModelArtsTrainJobCompleted, ModelArtsTrainJobFailed, ModelArtsTrainJobKilled, ModelArtsStopped, JobStopped, JobFailed, JobSucceeded).Find(&cloudbrains)
}


func GetCloudbrainCountByUserID(userID int64, jobType string) (int, error) { func GetCloudbrainCountByUserID(userID int64, jobType string) (int, error) {
count, err := x.In("status", JobWaiting, JobRunning).And("job_type = ? and user_id = ? and type = ?", jobType, userID, TypeCloudBrainOne).Count(new(Cloudbrain)) count, err := x.In("status", JobWaiting, JobRunning).And("job_type = ? and user_id = ? and type = ?", jobType, userID, TypeCloudBrainOne).Count(new(Cloudbrain))


+ 9
- 1
routers/repo/cloudbrain.go View File

@@ -1485,11 +1485,19 @@ func SyncCloudbrainStatus() {
} }


func HandleTaskWithNoDuration(ctx *context.Context) { func HandleTaskWithNoDuration(ctx *context.Context) {
mode := ctx.Query("mode")
log.Info("HandleTaskWithNoDuration start") log.Info("HandleTaskWithNoDuration start")
count := 0 count := 0
start := time.Now().Unix() start := time.Now().Unix()
for { for {
cloudBrains, err := models.GetStoppedJobWithNoDurationJob()
var cloudBrains []*models.Cloudbrain
var err error
if mode == "1" {
cloudBrains, err = models.GetStoppedJobWithNoStartTimeEndTime()
} else {
cloudBrains, err = models.GetStoppedJobWithNoDurationJob()
}

if err != nil { if err != nil {
log.Error("HandleTaskWithNoTrainJobDuration failed:", err.Error()) log.Error("HandleTaskWithNoTrainJobDuration failed:", err.Error())
break break


Loading…
Cancel
Save