Browse Source

优化上链代码

pull/52/head
JeshuaRen 7 months ago
parent
commit
4b575059a0
2 changed files with 22 additions and 16 deletions
  1. +10
    -0
      sdks/hpc/job.go
  2. +12
    -16
      sdks/scheduler/models.go

+ 10
- 0
sdks/hpc/job.go View File

@@ -5,6 +5,7 @@ import (
schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler" schsdk "gitlink.org.cn/cloudream/common/sdks/scheduler"
"gitlink.org.cn/cloudream/common/utils/http2" "gitlink.org.cn/cloudream/common/utils/http2"
"gitlink.org.cn/cloudream/common/utils/serder" "gitlink.org.cn/cloudream/common/utils/serder"
"io"
"net/url" "net/url"
"strings" "strings"
) )
@@ -57,6 +58,15 @@ func (c *Client) CreateJob(req CreateHPCJobReq, token string) (*CreateJobResp, e
return nil, err return nil, err
} }


// 打印resp.Body内容
body, err := io.ReadAll(resp.Body)
if err != nil {
println("Error reading response body:", err)
}

// Print the response body as a string
println("Response Body:", string(body))

contType := resp.Header.Get("Content-Type") contType := resp.Header.Get("Content-Type")
if strings.Contains(contType, http2.ContentTypeJSON) { if strings.Contains(contType, http2.ContentTypeJSON) {
var codeResp respons2[CreateJobResp] var codeResp respons2[CreateJobResp]


+ 12
- 16
sdks/scheduler/models.go View File

@@ -51,7 +51,6 @@ type JobSetInfo struct {
type JobInfo interface { type JobInfo interface {
GetLocalJobID() string GetLocalJobID() string
GetTargetLocalJobIDs() []string GetTargetLocalJobIDs() []string
RemoveTargetLocalJobID(targetID string)
} }


var JobInfoTypeUnion = types.NewTypeUnion[JobInfo]( var JobInfoTypeUnion = types.NewTypeUnion[JobInfo](
@@ -70,8 +69,14 @@ var JobInfoTypeUnion = types.NewTypeUnion[JobInfo](
var _ = serder.UseTypeUnionInternallyTagged(&JobInfoTypeUnion, "type") var _ = serder.UseTypeUnionInternallyTagged(&JobInfoTypeUnion, "type")


type JobInfoBase struct { type JobInfoBase struct {
LocalJobID string `json:"localJobID"`
TargetLocalJobIDs []string `json:"targetLocalJobIDs"`
LocalJobID string `json:"localJobID"`
//TargetLocalJobIDs []string `json:"targetLocalJobIDs"`
TargetJobInfos []TargetJobInfo `json:"targetJobInfos"`
}

type TargetJobInfo struct {
TargetJobID string `json:"targetJobID"`
InputParams map[string]string `json:"inputParams"`
} }


func (i *JobInfoBase) GetLocalJobID() string { func (i *JobInfoBase) GetLocalJobID() string {
@@ -79,20 +84,11 @@ func (i *JobInfoBase) GetLocalJobID() string {
} }


func (i *JobInfoBase) GetTargetLocalJobIDs() []string { func (i *JobInfoBase) GetTargetLocalJobIDs() []string {
return i.TargetLocalJobIDs
}

func (i *JobInfoBase) GetTargetLocalJobIDs2() []string {
return i.TargetLocalJobIDs
}

func (i *JobInfoBase) RemoveTargetLocalJobID(targetID string) {
// 从i.TargetLocalJobIDs中删除id
for j, id := range i.TargetLocalJobIDs {
if targetID == id {
i.TargetLocalJobIDs = append(i.TargetLocalJobIDs[:j], i.TargetLocalJobIDs[j+1:]...)
}
var IDs []string
for _, v := range i.TargetJobInfos {
IDs = append(IDs, v.TargetJobID)
} }
return IDs
} }


type NormalJobInfo struct { type NormalJobInfo struct {


Loading…
Cancel
Save