JointCloud
/
JCC-CSScheduler
mirror of https://gitlink.org.cn/cloudream/scheduler.git
24
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

代码优化

This commit is contained in:
JeshuaRen 2025-02-21 17:22:42 +08:00
parent 190bc58fdb
commit a9e69e8fd7
5 changed files with 69 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/assets/confs/test.json
View File

@ -1,15 +1,16 @@
{ {
"userID": 5, "userID": 5,
"type": "children", "packageID": 1191,
"param": { "uploadParams": {
"clusterID": "1865927992266461184", "dataType": "code",
"name": "zeeTest", "uploadInfo": {
"description": "asd", "type": "url",
"packageID": 1151, "url": "https://gitlink.org.cn/keytoolazy/adblock_auto.git",
"filePath": "/222.txt", "clusterID": [
"packageName": "anzetest", "1790300942428540928"
"bootstrapObjectID": 50085, ],
"parentImageID": 5, "packageID": 1191,
"imageID": "1234" "dataName": "adblock_auto"
}
} }
} }

19
log/schedulerclient.log
View File

@ -2646,3 +2646,22 @@ Key: 'QueryUploadedReq.UserID' Error:Field validation for 'UserID' failed on the
2025-02-21 15:33:24 [INFO] [JobID:0] state changed: *state2.DataUpload -> *state.Completed 2025-02-21 15:33:24 [INFO] [JobID:0] state changed: *state2.DataUpload -> *state.Completed
2025-02-21 15:33:24 [INFO] [JobID:0] [LastState:*state2.DataUpload] job failed with: blockchain: list objects: Post "http://localhost:32010/object/listByIDs": dial tcp [::1]:32010: connectex: No connection could be made because the target machine actively refused it. 2025-02-21 15:33:24 [INFO] [JobID:0] [LastState:*state2.DataUpload] job failed with: blockchain: list objects: Post "http://localhost:32010/object/listByIDs": dial tcp [::1]:32010: connectex: No connection could be made because the target machine actively refused it.
2025-02-21 15:33:24 [INFO] job set 0 completed 2025-02-21 15:33:24 [INFO] job set 0 completed
2025-02-21 15:33:36 [INFO] start serving http at: :7891
2025-02-21 15:34:35 [WARN] [HTTP:JobSet.CreateFolder] creating folder: clone package: Post "http://localhost:32010/package/clone": dial tcp [::1]:32010: connectex: No connection could be made because the target machine actively refused it.
2025-02-21 15:40:09 [INFO] start serving http at: :7891
2025-02-21 15:40:27 [DEBU] uploading job
2025-02-21 15:41:22 [ERRO] blockchain: invoke blockchain: code: 401, message: 暂未登录或token已经过期
2025-02-21 15:41:22 [INFO] jobID: %s change state from %s to %s0&{5 1161 0xc0002420a0 code 1 0xc000464390 {{} {1 0}} 0xc0004b8990} &{0xc000226640}
2025-02-21 15:41:22 [INFO] [JobID:0] state changed: *state2.DataUpload -> *state.Completed
2025-02-21 15:41:22 [INFO] [JobID:0] [LastState:*state2.DataUpload] job failed with: blockchain: invoke blockchain: code: 401, message: 暂未登录或token已经过期
2025-02-21 15:41:22 [INFO] job set 0 completed
2025-02-21 16:25:33 [INFO] start serving http at: :7891
2025-02-21 16:28:19 [DEBU] uploading job
2025-02-21 16:32:03 [INFO] start serving http at: :7891
2025-02-21 16:32:06 [DEBU] uploading job
2025-02-21 16:33:22 [INFO] start serving http at: :7891
2025-02-21 16:33:55 [DEBU] uploading job
2025-02-21 16:36:30 [INFO] start serving http at: :7891
2025-02-21 16:37:27 [DEBU] uploading job
2025-02-21 16:37:35 [INFO] start serving http at: :7891
2025-02-21 16:39:13 [DEBU] uploading job

8
schedulerMiddleware/internal/cmdline/serve.go
View File

@ -68,8 +68,12 @@ func serve(configPath string, address string) {
hubConfig := &pcmHubConfig.Config{ hubConfig := &pcmHubConfig.Config{
Platforms: config.Cfg().PCMHub, Platforms: config.Cfg().PCMHub,
} }
//hubClient, err := pcmHubClient.NewClient(hubConfig)
hubClient := pcmHubClient.InitGeneralClient(hubConfig, -1) hubClient, err := pcmHubClient.InitGeneralClient(hubConfig, -1)
if err != nil {
logger.Fatalf("new hub client failed, err: %s", err.Error())
os.Exit(1)
}
svc, err := services.NewService(preSchr, jobMgr, dbSvc, hubClient) svc, err := services.NewService(preSchr, jobMgr, dbSvc, hubClient)
if err != nil { if err != nil {

36
schedulerMiddleware/internal/http/jobset.go
View File

@ -50,7 +50,7 @@ func (s *JobSetService) Submit(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[JobSetSubmitReq](bodyData) req, err := serder.JSONToObjectEx[JobSetSubmitReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -117,7 +117,7 @@ func (s *JobSetService) Upload(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[UploadReq](bodyData) req, err := serder.JSONToObjectEx[UploadReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -167,7 +167,7 @@ func (s *JobSetService) UploadStatus(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[UploadStatusReq](bodyData) req, err := serder.JSONToObjectEx[UploadStatusReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -216,7 +216,7 @@ func (s *JobSetService) CreateFolder(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[CreateFolderReq](bodyData) req, err := serder.JSONToObjectEx[CreateFolderReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -248,7 +248,7 @@ func (s *JobSetService) DeleteFile(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[DeleteFileReq](bodyData) req, err := serder.JSONToObjectEx[DeleteFileReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -281,7 +281,7 @@ func (s *JobSetService) DeleteFolder(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[DeleteFolderReq](bodyData) req, err := serder.JSONToObjectEx[DeleteFolderReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -320,7 +320,7 @@ func (s *JobSetService) QueryUploaded(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[QueryUploadedReq](bodyData) req, err := serder.JSONToObjectEx[QueryUploadedReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -358,7 +358,7 @@ func (s *JobSetService) Binding(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[BindingReq](bodyData) req, err := serder.JSONToObjectEx[BindingReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -389,7 +389,7 @@ func (s *JobSetService) RemoveBinding(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[RemoveBindingReq](bodyData) req, err := serder.JSONToObjectEx[RemoveBindingReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -425,7 +425,7 @@ func (s *JobSetService) QueryBinding(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[QueryBindingReq](bodyData) req, err := serder.JSONToObjectEx[QueryBindingReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -460,7 +460,7 @@ func (s *JobSetService) CreatePackage(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[PackageCreate](bodyData) req, err := serder.JSONToObjectEx[PackageCreate](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -492,7 +492,7 @@ func (s *JobSetService) DeletePackage(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[PackageDelete](bodyData) req, err := serder.JSONToObjectEx[PackageDelete](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -527,7 +527,7 @@ func (s *JobSetService) QueryResource(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[QueryResourceReq](bodyData) req, err := serder.JSONToObjectEx[QueryResourceReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -564,7 +564,7 @@ func (s *JobSetService) ResourceRange(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[QueryResourceRangeReq](bodyData) req, err := serder.JSONToObjectEx[QueryResourceRangeReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -603,7 +603,7 @@ func (s *JobSetService) QueryImages(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[QueryImagesReq](bodyData) req, err := serder.JSONToObjectEx[QueryImagesReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -642,7 +642,7 @@ func (s *JobSetService) ClonePackage(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[ClonePackageReq](bodyData) req, err := serder.JSONToObjectEx[ClonePackageReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -681,7 +681,7 @@ func (s *JobSetService) QueryClonePackage(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[QueryClonePackageReq](bodyData) req, err := serder.JSONToObjectEx[QueryClonePackageReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }
@ -716,7 +716,7 @@ func (s *JobSetService) RemoveClonePackage(ctx *gin.Context) {
req, err := serder.JSONToObjectEx[RemoveClonePackageReq](bodyData) req, err := serder.JSONToObjectEx[RemoveClonePackageReq](bodyData)
if err != nil { if err != nil {
log.Warnf("parsing request body: %s", err.Error()) log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed")) ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed, error: "+err.Error()))
return return
} }

15
schedulerMiddleware/internal/services/jobset.go
View File

@ -521,6 +521,15 @@ func (svc *JobSetService) DataBinding(id uploadersdk.DataID, userID cdssdk.UserI
var jsonData []byte var jsonData []byte
switch clusterInfo.ClusterName { switch clusterInfo.ClusterName {
case sch.PlatformModelArts: case sch.PlatformModelArts:
engine := algorithm.Engine{
EngineName: "Ascend-Powered-Engine",
EngineVersion: "", // 从URL里提取
ImageUrl: "", // 从数据库中获取
InstallSysPackages: true,
}
println(engine)
resp, err := svc.hubClient.ModelArts.BindAlgorithm(codeParam) resp, err := svc.hubClient.ModelArts.BindAlgorithm(codeParam)
if err != nil { if err != nil {
return err return err
@ -530,11 +539,15 @@ func (svc *JobSetService) DataBinding(id uploadersdk.DataID, userID cdssdk.UserI
return err return err
} }
case sch.PlatformOpenI: case sch.PlatformOpenI:
codeParam.Branch = "master" //openi不需要传Engine
resp, err := svc.hubClient.OpenI.BindAlgorithm(codeParam) resp, err := svc.hubClient.OpenI.BindAlgorithm(codeParam)
if err != nil { if err != nil {
return err return err
} }
err = svc.hubClient.UploadOpenIAlgorithm(codeParam, int(bd.PackageID))
if err != nil {
return err
}
jsonData, err = json.Marshal(resp.Data) jsonData, err = json.Marshal(resp.Data)
if err != nil { if err != nil {
return err return err