From 4fe78dee51879c220d32325013ddf10d4647fc2c Mon Sep 17 00:00:00 2001 From: jagger Date: Fri, 19 Apr 2024 17:09:54 +0800 Subject: [PATCH 1/2] feat: Task status statistics Signed-off-by: jagger Former-commit-id: 2c01ea8c254c0a4a2bb1f80ed77f5bfcfe5726d4 --- api/internal/logic/core/counttaskstatuslogic.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/api/internal/logic/core/counttaskstatuslogic.go b/api/internal/logic/core/counttaskstatuslogic.go index 7f8cc190..d3174b31 100644 --- a/api/internal/logic/core/counttaskstatuslogic.go +++ b/api/internal/logic/core/counttaskstatuslogic.go @@ -24,14 +24,22 @@ func NewCountTaskStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *C } type taskStatus struct { - Quantity string `json:"quantity"` - Status string `json:"status"` + Succeeded int `json:"Succeeded"` + Failed int `json:"Failed"` + Running int `json:"Running"` + Pause int `json:"Pause"` } func (l *CountTaskStatusLogic) CountTaskStatus() (resp *types.ListResult, err error) { resp = &types.ListResult{} var taskStatusList []*taskStatus - err = l.svcCtx.DbEngin.Raw("select count(*) quantity, status from task group by status").Scan(&taskStatusList).Error + sqlStr := `SELECT + COUNT(CASE WHEN status = 'Succeeded' THEN 1 END) AS Succeeded, + COUNT(CASE WHEN status = 'Failed' THEN 1 END) AS Failed, + COUNT(CASE WHEN status = 'Running' THEN 1 END) AS Running, + COUNT(CASE WHEN status = 'Pause' THEN 1 END) AS Pause + FROM task;` + err = l.svcCtx.DbEngin.Raw(sqlStr).Scan(&taskStatusList).Error if err != nil { logx.Errorf("CountTaskStatus() => sql execution error: %v", err) return nil, errors.Errorf("Description Failed to collect statistics on the status of a task. Please try again later") From 0515e9702c5f436b5bf0f5036cd9d24fe46c1aee Mon Sep 17 00:00:00 2001 From: jagger Date: Fri, 19 Apr 2024 17:43:45 +0800 Subject: [PATCH 2/2] fix returns the data structure Signed-off-by: jagger Former-commit-id: 9b3933586a514bd6e58a76449ab427177a89c3e5 --- api/desc/core/pcm-core.api | 7 + api/desc/pcm.api | 2 +- api/desc/pcm.json | 4 +- api/desc/storelink/pcm-storelink.api | 2 +- .../logic/core/counttaskstatuslogic.go | 16 +- api/internal/types/types.go | 187 +++++++++++++++++- 6 files changed, 201 insertions(+), 17 deletions(-) diff --git a/api/desc/core/pcm-core.api b/api/desc/core/pcm-core.api index 9d3b7803..a340da14 100644 --- a/api/desc/core/pcm-core.api +++ b/api/desc/core/pcm-core.api @@ -1086,4 +1086,11 @@ type Card { TOpsAtFp16 float64 `json:"TOpsAtFp16"` CardHours float64 `json:"cardHours"` CardNum int32 `json:"cardNum"` +} + +type TaskStatusResp { + Succeeded int `json:"Succeeded"` + Failed int `json:"Failed"` + Running int `json:"Running"` + Pause int `json:"Pause"` } \ No newline at end of file diff --git a/api/desc/pcm.api b/api/desc/pcm.api index 13e2e7a0..2c76692c 100644 --- a/api/desc/pcm.api +++ b/api/desc/pcm.api @@ -136,7 +136,7 @@ service pcm { @doc "Statistical task status" @handler countTaskStatus - get /core/task/countTaskStatus () returns(ListResult) + get /core/task/countTaskStatus () returns(TaskStatusResp) } //hpc二级接口 diff --git a/api/desc/pcm.json b/api/desc/pcm.json index 8e37ad67..e7694333 100644 --- a/api/desc/pcm.json +++ b/api/desc/pcm.json @@ -15102,7 +15102,7 @@ "taskName": { "type": "string" }, - "taskStatus": { + "TaskStatus": { "type": "string" }, "startedAt": { @@ -15118,7 +15118,7 @@ "required": [ "taskId", "taskName", - "taskStatus", + "TaskStatus", "startedAt", "completedAt" ] diff --git a/api/desc/storelink/pcm-storelink.api b/api/desc/storelink/pcm-storelink.api index cb04f4fa..eeea4c46 100644 --- a/api/desc/storelink/pcm-storelink.api +++ b/api/desc/storelink/pcm-storelink.api @@ -94,7 +94,7 @@ type ( TaskSl { TaskId string `json:"taskId"` TaskName string `json:"taskName"` - TaskStatus string `json:"taskStatus"` + TaskStatus string `json:"TaskStatus"` StartedAt int64 `json:"startedAt"` CompletedAt int64 `json:"completedAt"` } diff --git a/api/internal/logic/core/counttaskstatuslogic.go b/api/internal/logic/core/counttaskstatuslogic.go index d3174b31..5cedea7f 100644 --- a/api/internal/logic/core/counttaskstatuslogic.go +++ b/api/internal/logic/core/counttaskstatuslogic.go @@ -3,6 +3,7 @@ package core import ( "context" "github.com/pkg/errors" + "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/svc" "gitlink.org.cn/JointCloud/pcm-coordinator/api/internal/types" @@ -23,27 +24,18 @@ func NewCountTaskStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *C } } -type taskStatus struct { - Succeeded int `json:"Succeeded"` - Failed int `json:"Failed"` - Running int `json:"Running"` - Pause int `json:"Pause"` -} - -func (l *CountTaskStatusLogic) CountTaskStatus() (resp *types.ListResult, err error) { - resp = &types.ListResult{} - var taskStatusList []*taskStatus +func (l *CountTaskStatusLogic) CountTaskStatus() (resp *types.TaskStatusResp, err error) { + resp = &types.TaskStatusResp{} sqlStr := `SELECT COUNT(CASE WHEN status = 'Succeeded' THEN 1 END) AS Succeeded, COUNT(CASE WHEN status = 'Failed' THEN 1 END) AS Failed, COUNT(CASE WHEN status = 'Running' THEN 1 END) AS Running, COUNT(CASE WHEN status = 'Pause' THEN 1 END) AS Pause FROM task;` - err = l.svcCtx.DbEngin.Raw(sqlStr).Scan(&taskStatusList).Error + err = l.svcCtx.DbEngin.Raw(sqlStr).Scan(&resp).Error if err != nil { logx.Errorf("CountTaskStatus() => sql execution error: %v", err) return nil, errors.Errorf("Description Failed to collect statistics on the status of a task. Please try again later") } - resp.List = &taskStatusList return } diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 5b0c362d..59dd185d 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -874,6 +874,191 @@ type ListResult struct { List interface{} `json:"list,omitempty"` } +type HpcInfo struct { + Id int64 `json:"id"` // id + TaskId int64 `json:"task_id"` // 任务id + JobId string `json:"job_id"` // 作业id(在第三方系统中的作业id) + AdapterId int64 `json:"adapter_id"` // 执行任务的适配器id + ClusterId int64 `json:"cluster_id"` // 执行任务的集群id + ClusterType string `json:"cluster_type"` // 执行任务的集群类型 + Name string `json:"name"` // 名称 + Status string `json:"status"` // 状态 + CmdScript string `json:"cmd_script"` + StartTime string `json:"start_time"` // 开始时间 + RunningTime int64 `json:"running_time"` // 运行时间 + DerivedEs string `json:"derived_es"` + Cluster string `json:"cluster"` + BlockId int64 `json:"block_id"` + AllocNodes int64 `json:"alloc_nodes"` + AllocCpu int64 `json:"alloc_cpu"` + CardCount int64 `json:"card_count"` // 卡数 + Version string `json:"version"` + Account string `json:"account"` + WorkDir string `json:"work_dir"` // 工作路径 + AssocId int64 `json:"assoc_id"` + ExitCode int64 `json:"exit_code"` + WallTime string `json:"wall_time"` // 最大运行时间 + Result string `json:"result"` // 运行结果 + DeletedAt string `json:"deleted_at"` // 删除时间 + YamlString string `json:"yaml_string"` + AppType string `json:"app_type"` // 应用类型 + AppName string `json:"app_name"` // 应用名称 + Queue string `json:"queue"` // 队列名称 + SubmitType string `json:"submit_type"` // cmd（命令行模式） + NNode string `json:"n_node"` // 节点个数（当指定该参数时，GAP_NODE_STRING必须为""） + StdOutFile string `json:"std_out_file"` // 工作路径/std.err.%j + StdErrFile string `json:"std_err_file"` // 工作路径/std.err.%j + StdInput string `json:"std_input"` + Environment string `json:"environment"` + DeletedFlag int64 `json:"deleted_flag"` // 是否删除（0-否，1-是） + CreatedBy int64 `json:"created_by"` // 创建人 + CreatedTime string `json:"created_time"` // 创建时间 + UpdatedBy int64 `json:"updated_by"` // 更新人 + UpdatedTime string `json:"updated_time"` // 更新时间 +} + +type CloudInfo struct { + Participant int64 `json:"participant,omitempty"` + Id int64 `json:"id,omitempty"` + TaskId int64 `json:"taskId,omitempty"` + ApiVersion string `json:"apiVersion,omitempty"` + Kind string `json:"kind,omitempty"` + Namespace string `json:"namespace,omitempty"` + Name string `json:"name,omitempty"` + Status string `json:"status,omitempty"` + StartTime string `json:"startTime,omitempty"` + RunningTime int64 `json:"runningTime,omitempty"` + Result string `json:"result,omitempty"` + YamlString string `json:"yamlString,omitempty"` +} + +type AiInfo struct { + ParticipantId int64 `json:"participantId,omitempty"` + TaskId int64 `json:"taskId,omitempty"` + ProjectId string `json:"project_id,omitempty"` + Name string `json:"name,omitempty"` + Status string `json:"status,omitempty"` + StartTime string `json:"startTime,omitempty"` + RunningTime int64 `json:"runningTime,omitempty"` + Result string `json:"result,omitempty"` + JobId string `json:"jobId,omitempty"` + CreateTime string `json:"createTime,omitempty"` + ImageUrl string `json:"imageUrl,omitempty"` + Command string `json:"command,omitempty"` + FlavorId string `json:"flavorId,omitempty"` + SubscriptionId string `json:"subscriptionId,omitempty"` + ItemVersionId string `json:"itemVersionId,omitempty"` +} + +type VmInfo struct { + ParticipantId int64 `json:"participantId,omitempty"` + TaskId int64 `json:"taskId,omitempty"` + Name string `json:"name,omitempty"` + FlavorRef string `json:"flavor_ref,omitempty"` + ImageRef string `json:"image_ref,omitempty"` + NetworkUuid string `json:"network_uuid,omitempty"` + BlockUuid string `json:"block_uuid,omitempty"` + SourceType string `json:"source_type,omitempty"` + DeleteOnTermination bool `json:"delete_on_termination,omitempty"` + Status string `json:"status,omitempty"` + MinCount string `json:"min_count,omitempty"` + Platform string `json:"platform,omitempty"` + Uuid string `json:"uuid,omitempty"` +} + +type PullTaskInfoReq struct { + AdapterId int64 `form:"adapterId"` +} + +type PullTaskInfoResp struct { + HpcInfoList []*HpcInfo `json:"HpcInfoList,omitempty"` + CloudInfoList []*CloudInfo `json:"CloudInfoList,omitempty"` + AiInfoList []*AiInfo `json:"AiInfoList,omitempty"` + VmInfoList []*VmInfo `json:"VmInfoList,omitempty"` +} + +type PushTaskInfoReq struct { + AdapterId int64 `json:"adapterId"` + HpcInfoList []*HpcInfo `json:"hpcInfoList"` + CloudInfoList []*CloudInfo `json:"cloudInfoList"` + AiInfoList []*AiInfo `json:"aiInfoList"` + VmInfoList []*VmInfo `json:"vmInfoList"` +} + +type PushTaskInfoResp struct { + Code int64 `json:"code"` + Msg string `json:"msg"` +} + +type PushResourceInfoReq struct { + AdapterId int64 `json:"adapterId"` + ResourceStats []ResourceStats `json:"resourceStats"` +} + +type PushResourceInfoResp struct { + Code int64 `json:"code"` + Msg string `json:"msg"` +} + +type NoticeInfo struct { + AdapterId int64 `json:"adapterId"` + AdapterName string `json:"adapterName"` + ClusterId int64 `json:"clusterId"` + ClusterName string `json:"clusterName"` + NoticeType string `json:"noticeType"` + TaskName string `json:"taskName"` + Incident string `json:"incident"` +} + +type ListNoticeReq struct { +} + +type ListNoticeResp struct { + Code int64 `json:"code"` + Msg string `json:"msg"` + Data []NoticeInfo `json:"data"` +} + +type PushNoticeReq struct { + NoticeInfo NoticeInfo `json:"noticeInfo"` +} + +type PushNoticeResp struct { + Code int64 `json:"code"` + Msg string `json:"msg"` +} + +type ResourceStats struct { + ClusterId int64 `json:"clusterId"` + Name string `json:"name"` + CpuCoreAvail int64 `json:"cpuCoreAvail"` + CpuCoreTotal int64 `json:"cpuCoreTotal"` + MemAvail float64 `json:"memAvail"` + MemTotal float64 `json:"memTotal"` + DiskAvail float64 `json:"diskAvail"` + DiskTotal float64 `json:"diskTotal"` + GpuAvail int64 `json:"gpuAvail"` + CardsAvail []*Card `json:"cardsAvail"` + CpuCoreHours float64 `json:"cpuCoreHours"` + Balance float64 `json:"balance"` +} + +type Card struct { + Platform string `json:"platform"` + Type string `json:"type"` + Name string `json:"name"` + TOpsAtFp16 float64 `json:"TOpsAtFp16"` + CardHours float64 `json:"cardHours"` + CardNum int32 `json:"cardNum"` +} + +type TaskStatusResp struct { + Succeeded int `json:"Succeeded"` + Failed int `json:"Failed"` + Running int `json:"Running"` + Pause int `json:"Pause"` +} + type CommitHpcTaskReq struct { Name string `json:"name"` // paratera:jobName Description string `json:"description,optional"` @@ -5250,7 +5435,7 @@ type DeleteLinkTaskResp struct { type TaskSl struct { TaskId string `json:"taskId"` TaskName string `json:"taskName"` - TaskStatus string `json:"taskStatus"` + TaskStatus string `json:"TaskStatus"` StartedAt int64 `json:"startedAt"` CompletedAt int64 `json:"completedAt"` }