Browse Source

debug

tags/v1.22.6.1^2
lewis 3 years ago
parent
commit
61d01bba9a
2 changed files with 19 additions and 6 deletions
  1. +14
    -0
      modules/storage/obs.go
  2. +5
    -6
      routers/repo/modelarts.go

+ 14
- 0
modules/storage/obs.go View File

@@ -564,3 +564,17 @@ func ObsCreateObject(path string) error {

return nil
}

func GetObsLogFileName(prefix string) (string, error) {
input := &obs.ListObjectsInput{}
input.Bucket = setting.Bucket
input.Prefix = prefix

output, err := ObsCli.ListObjects(input)
if err != nil {
log.Error("PutObject failed:", err.Error())
return "", err
}

return output.Contents[0].Key, nil
}

+ 5
- 6
routers/repo/modelarts.go View File

@@ -2403,16 +2403,15 @@ func TrainJobDownloadLogFile(ctx *context.Context) {
return
}

resultLogFile, err := modelarts.GetTrainJobLogFileNames(jobID, strconv.FormatInt(task.VersionID, 10))
prefix := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, versionName), "/") + "/job"
key, err := storage.GetObsLogFileName(prefix)
if err != nil {
log.Error("GetTrainJobLogFileNames(%s) failed:%v", jobID, err.Error(), ctx.Data["msgID"])
ctx.ServerError("GetTrainJobLogFileNames", err)
log.Error("GetObsLogFileName(%s) failed:%v", jobID, err.Error(), ctx.Data["msgID"])
ctx.ServerError("GetObsLogFileName", err)
return
}

path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, modelarts.LogPath, versionName, resultLogFile.LogFileList[0]), "/")

url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, key)
if err != nil {
log.Error("GetObsCreateSignedUrlByBucketAndKey failed: %v", err.Error(), ctx.Data["msgID"])
ctx.ServerError("GetObsCreateSignedUrlByBucketAndKey", err)


Loading…
Cancel
Save