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

调整notifyUploaded接口

This commit is contained in:
JeshuaRen 2025-02-17 16:14:04 +08:00
parent 98603bc74d
commit afa768a8db
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
log/schedulerclient.log
View File

@ -2508,3 +2508,10 @@ Key: 'QueryUploadedReq.UserID' Error:Field validation for 'UserID' failed on the
2025-02-14 15:57:39 [WARN] [HTTP:JobSet.QueryUploaded] getting service list: failed to query uploaded data: code: OperationFailed, message: listing objects: requsting to coodinator: code: OperationFailed, message: get objects with prefix failed
2025-02-14 15:57:45 [WARN] [HTTP:JobSet.QueryUploaded] getting service list: failed to query uploaded data: code: OperationFailed, message: listing objects: requsting to coodinator: code: OperationFailed, message: get objects with prefix failed
2025-02-17 09:37:07 [INFO] start serving http at: :7891
2025-02-17 09:48:42 [INFO] start serving http at: :7891
2025-02-17 14:54:13 [INFO] start serving http at: :7891
2025-02-17 14:55:29 [WARN] [HTTP:JobSet.Binding] getting service list: no package found
2025-02-17 14:55:42 [WARN] [HTTP:JobSet.Binding] getting service list: no package found
2025-02-17 14:57:16 [WARN] [HTTP:JobSet.Binding] getting service list: no package found
2025-02-17 16:01:26 [INFO] start serving http at: :7891
2025-02-17 16:05:19 [DEBU] uploading job

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

@ -108,7 +108,7 @@ type UploadReq struct {
// BucketID cdssdk.BucketID `json:"bucketID"`
//}
func (s *JobSetService) Upload(ctx *gin.Context) {
func (s *JobSetService) Upload2(ctx *gin.Context) {
log := logger.WithField("HTTP", "JobSet.Upload")
bodyData, err := io.ReadAll(ctx.Request.Body)
@ -164,6 +164,48 @@ func (s *JobSetService) Upload(ctx *gin.Context) {
}
}
func (s *JobSetService) Upload(ctx *gin.Context) {
log := logger.WithField("HTTP", "JobSet.Upload")
bodyData, err := io.ReadAll(ctx.Request.Body)
if err != nil {
log.Warnf("reading request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "read request body failed"))
return
}
req, err := serder.JSONToObjectEx[UploadReq](bodyData)
if err != nil {
log.Warnf("parsing request body: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "parse request body failed"))
return
}
blockChainToken := ctx.Request.Header.Get("Authorization")
task := jobTask.NewJobTask[sch.TaskMessage]()
_, err = s.svc.JobSetSvc().Upload(req.UserID, req.UploadParams, blockChainToken, task)
if err != nil {
log.Warnf("uploading file: %s", err.Error())
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "upload file failed, error: "+err.Error()))
return
}
for {
fut := task.Receive()
receive := <-fut.Chan()
if receive.Value.Status == sch.FailedStatus {
ctx.JSON(http.StatusOK, Failed(errorcode.OperationFailed, "upload file failed, error: "+receive.Value.Message))
return
}
if receive.Value.Status == sch.SuccessStatus {
ctx.JSON(http.StatusOK, OK("success"))
return
}
}
}
type CreateFolderReq struct {
PackageID cdssdk.PackageID `json:"packageID"`
Path string `json:"path"`