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:
songjc 2023-09-04 16:56:13 +08:00
parent 7187e46185
commit efcf4c2c1f
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/pkgs/mq/executor/task/task.go
View File

@ -8,66 +8,66 @@ type TaskStatusConst interface {
type ScheduleTaskStatus struct {
Status string `json:"status"`
Err error `json:"err"`
Error string `json:"error"`
PCMJobID int64 `json:"pcmJobID"`
}
func NewScheduleTaskStatus(status string, err error, pcmJobID int64) ScheduleTaskStatus {
func NewScheduleTaskStatus(status string, err string, pcmJobID int64) ScheduleTaskStatus {
return ScheduleTaskStatus{
Status: status,
Err: err,
Error: err,
PCMJobID: pcmJobID,
}
}
type UploadImageTaskStatus struct {
Status string `json:"status"`
Err error `json:"err"`
Error string `json:"error"`
ImageID int64 `json:"imageID"`
}
func NewUploadImageTaskStatus(status string, err error, imageID int64) UploadImageTaskStatus {
func NewUploadImageTaskStatus(status string, err string, imageID int64) UploadImageTaskStatus {
return UploadImageTaskStatus{
Status: status,
Err: err,
Error: err,
ImageID: imageID,
}
}
type CacheMovePackageTaskStatus struct {
Status string `json:"status"`
Err error `json:"err"`
Error string `json:"error"`
}
func NewCacheMovePackageTaskStatus(status string, err error) CacheMovePackageTaskStatus {
func NewCacheMovePackageTaskStatus(status string, err string) CacheMovePackageTaskStatus {
return CacheMovePackageTaskStatus{
Status: status,
Err: err,
Error: err,
}
}
type CreatePackageTaskStatus struct {
Status string `json:"status"`
Err error `json:"err"`
Error string `json:"error"`
PackageID int64 `json:"packageID"`
}
func NewCreatePackageTaskStatus(status string, err error, packageID int64) CreatePackageTaskStatus {
func NewCreatePackageTaskStatus(status string, err string, packageID int64) CreatePackageTaskStatus {
return CreatePackageTaskStatus{
Status: status,
Err: err,
Error: err,
PackageID: packageID,
}
}
type LoadPackageTaskStatus struct {
Status string `json:"status"`
Err error `json:"err"`
Error string `json:"error"`
}
func NewLoadPackageTaskStatus(status string, err error) LoadPackageTaskStatus {
func NewLoadPackageTaskStatus(status string, err string) LoadPackageTaskStatus {
return LoadPackageTaskStatus{
Status: status,
Err: err,
Error: err,
}
}

4
executor/internal/task/cache_move_package.go
View File

@ -33,9 +33,9 @@ func (t *CacheMovePackage) Execute(task *task.Task[TaskContext], ctx TaskContext
err := t.do(ctx)
if err != nil {
//TODO 若任务失败，上报的状态failed字段根据情况修改
ctx.reporter.Report(task.ID(), exectsk.NewCacheMovePackageTaskStatus("failed", err))
ctx.reporter.Report(task.ID(), exectsk.NewCacheMovePackageTaskStatus("failed", err.Error()))
} else {
ctx.reporter.Report(task.ID(), exectsk.NewCacheMovePackageTaskStatus("completed", nil))
ctx.reporter.Report(task.ID(), exectsk.NewCacheMovePackageTaskStatus("completed", ""))
}
ctx.reporter.ReportNow()

4
executor/internal/task/pcm_scheduler_task.go
View File

@ -36,7 +36,7 @@ func (t *PCMScheduleTask) Execute(task *task.Task[TaskContext], ctx TaskContext,
err := t.do(task.ID(), ctx)
if err != nil {
//TODO 若任务失败，上报的状态failed字段根据情况修改
ctx.reporter.Report(task.ID(), exectsk.NewScheduleTaskStatus("failed", err, 0))
ctx.reporter.Report(task.ID(), exectsk.NewScheduleTaskStatus("failed", err.Error(), 0))
}
ctx.reporter.ReportNow()
@ -74,7 +74,7 @@ func (t *PCMScheduleTask) do(taskID string, ctx TaskContext) error {
}
if tsResp.Status != prevStatus {
ctx.reporter.Report(taskID, exectsk.NewScheduleTaskStatus(tsResp.Status, nil, resp.PCMJobID))
ctx.reporter.Report(taskID, exectsk.NewScheduleTaskStatus(tsResp.Status, "", resp.PCMJobID))
}
prevStatus = tsResp.Status

4
executor/internal/task/pcm_upload_img.go
View File

@ -31,7 +31,7 @@ func (t *PCMUploadImage) Execute(task *task.Task[TaskContext], ctx TaskContext,
err := t.do(task.ID(), ctx)
if err != nil {
//TODO 若任务失败，上报的状态failed字段根据情况修改
ctx.reporter.Report(task.ID(), exectsk.NewUploadImageTaskStatus("failed", err, 0))
ctx.reporter.Report(task.ID(), exectsk.NewUploadImageTaskStatus("failed", err.Error(), 0))
}
ctx.reporter.ReportNow()
@ -56,6 +56,6 @@ func (t *PCMUploadImage) do(taskID string, ctx TaskContext) error {
}
// TODO 根据接口result返回情况修改
ctx.reporter.Report(taskID, exectsk.NewUploadImageTaskStatus(resp.Result, nil, resp.ImageID))
ctx.reporter.Report(taskID, exectsk.NewUploadImageTaskStatus(resp.Result, "", resp.ImageID))
return nil
}

4
executor/internal/task/storage_create_package.go
View File

@ -40,7 +40,7 @@ func (t *StorageCreatePackage) Execute(task *task.Task[TaskContext], ctx TaskCon
err := t.do(task.ID(), ctx)
if err != nil {
//TODO 若任务失败，上报的状态failed字段根据情况修改
ctx.reporter.Report(task.ID(), exectsk.NewCreatePackageTaskStatus("failed", err, 0))
ctx.reporter.Report(task.ID(), exectsk.NewCreatePackageTaskStatus("failed", err.Error(), 0))
}
ctx.reporter.ReportNow()
@ -69,6 +69,6 @@ func (t *StorageCreatePackage) do(taskID string, ctx TaskContext) error {
}
// TODO 根据接口result返回情况修改
ctx.reporter.Report(taskID, exectsk.NewCreatePackageTaskStatus("completed", nil, resp.PackageID))
ctx.reporter.Report(taskID, exectsk.NewCreatePackageTaskStatus("completed", "", resp.PackageID))
return nil
}

4
executor/internal/task/storage_load_package.go
View File

@ -33,9 +33,9 @@ func (t *StorageLoadPackage) Execute(task *task.Task[TaskContext], ctx TaskConte
err := t.do(ctx)
if err != nil {
//TODO 若任务失败，上报的状态failed字段根据情况修改
ctx.reporter.Report(task.ID(), exectsk.NewLoadPackageTaskStatus("failed", err))
ctx.reporter.Report(task.ID(), exectsk.NewLoadPackageTaskStatus("failed", err.Error()))
} else {
ctx.reporter.Report(task.ID(), exectsk.NewLoadPackageTaskStatus("completed", nil))
ctx.reporter.Report(task.ID(), exectsk.NewLoadPackageTaskStatus("completed", ""))
}
ctx.reporter.ReportNow()