Browse Source

提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>
pull/1530/head
zouap 3 years ago
parent
commit
8e5223c80e
2 changed files with 2 additions and 4 deletions
  1. +0
    -4
      routers/repo/cloudbrain.go
  2. +2
    -0
      routers/routes/routes.go

+ 0
- 4
routers/repo/cloudbrain.go View File

@@ -350,19 +350,15 @@ func CloudBrainShow(ctx *context.Context) {


func cloudBrainShow(ctx *context.Context, tpName base.TplName) { func cloudBrainShow(ctx *context.Context, tpName base.TplName) {
ctx.Data["PageIsCloudBrain"] = true ctx.Data["PageIsCloudBrain"] = true

var jobName = ctx.Params(":jobname") var jobName = ctx.Params(":jobname")
task, err := models.GetCloudbrainByName(jobName) task, err := models.GetCloudbrainByName(jobName)
if err != nil { if err != nil {
ctx.Data["error"] = err.Error() ctx.Data["error"] = err.Error()
} }
log.Info("task.JobID=" + task.JobID)
result, err := cloudbrain.GetJob(task.JobID) result, err := cloudbrain.GetJob(task.JobID)
if err != nil { if err != nil {
ctx.Data["error"] = err.Error() ctx.Data["error"] = err.Error()
} }
accuracyJson, _ := json.Marshal(result)
log.Info(" task result=" + string(accuracyJson))
if result != nil { if result != nil {
jobRes, _ := models.ConvertToJobResultPayload(result.Payload) jobRes, _ := models.ConvertToJobResultPayload(result.Payload)
jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB")


+ 2
- 0
routers/routes/routes.go View File

@@ -994,6 +994,8 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchmarkIndex) m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchmarkIndex)
m.Group("/:jobname", func() { m.Group("/:jobname", func() {
m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchMarkShow) m.Get("", reqRepoCloudBrainReader, repo.CloudBrainBenchMarkShow)
})
m.Group("/:jobid", func() {
m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop) m.Post("/stop", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.CloudBrainStop)
m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.BenchmarkDel) m.Post("/del", cloudbrain.AdminOrOwnerOrJobCreaterRight, repo.BenchmarkDel)
m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate) m.Get("/rate", reqRepoCloudBrainReader, repo.GetRate)


Loading…
Cancel
Save