floraachy
/
pcm-coordinator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'bug fix' (#328) from zhangweiii/pcm-coordinator:master into master 

Former-commit-id: a2dffbc56280a038a8e798125ab18ec73fbbd0f4
This commit is contained in:
zhangweiii 2024-10-31 17:32:07 +08:00
parent 8461a125da f0cd6d5769
commit ed5da106d4
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
desc/pcm.api
View File

@ -13,7 +13,7 @@ import (
"inference/inference.api" "inference/inference.api"
) )
info ( info(
title: "pcm api service" title: "pcm api service"
desc: "type desc here" desc: "type desc here"
author: "type author here" author: "type author here"
@ -22,7 +22,7 @@ info (
) )
//core端接口 //core端接口
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: core group: core
) )
@ -177,7 +177,7 @@ service pcm {
} }
//hpc二级接口 //hpc二级接口
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: hpc group: hpc
) )
@ -212,7 +212,7 @@ service pcm {
} }
//cloud二级接口 //cloud二级接口
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: cloud group: cloud
) )
@ -250,7 +250,7 @@ service pcm {
} }
//智算二级接口 //智算二级接口
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: ai group: ai
) )
@ -399,11 +399,11 @@ service pcm {
@doc "文本识别" @doc "文本识别"
@handler ChatHandler @handler ChatHandler
post /ai/chat (ChatReq) returns (ChatResult) post /ai/chat (ChatReq) returns (ChatResult)
/******chat end***********/ /******chat end***********/
} }
//screen接口 //screen接口
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: storage group: storage
) )
@ -418,7 +418,7 @@ service pcm {
} }
//openstack 接口 //openstack 接口
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: vm group: vm
) )
@ -817,7 +817,7 @@ service pcm {
} }
//存算联动 接口 //存算联动 接口
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: storelink group: storelink
) )
@ -848,7 +848,7 @@ service pcm {
} }
// 接口 // 接口
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: adapters group: adapters
) )
@ -893,7 +893,7 @@ service pcm {
get /adapter/getAdapterInfo (adapterInfoNameReq) returns (adapterInfoNameReqResp) get /adapter/getAdapterInfo (adapterInfoNameReq) returns (adapterInfoNameReqResp)
} }
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: schedule group: schedule
) )
@ -935,7 +935,7 @@ service pcm {
get /schedule/getClusterBalanceById/:adapterId/:clusterId (GetClusterBalanceByIdReq) returns (GetClusterBalanceByIdResp) get /schedule/getClusterBalanceById/:adapterId/:clusterId (GetClusterBalanceByIdReq) returns (GetClusterBalanceByIdResp)
} }
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: inference group: inference
) )
@ -992,7 +992,7 @@ service pcm {
get /inference/getAdaptersByModel (GetAdaptersByModelReq) returns (GetAdaptersByModelResp) get /inference/getAdaptersByModel (GetAdaptersByModelReq) returns (GetAdaptersByModelResp)
} }
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: dictionary group: dictionary
) )
@ -1031,7 +1031,7 @@ service pcm {
get /dictItem/code/:dictCode (DictCodeReq) returns (PageResult) get /dictItem/code/:dictCode (DictCodeReq) returns (PageResult)
} }
@server ( @server(
prefix: pcm/v1 prefix: pcm/v1
group: monitoring group: monitoring
) )
@ -1071,4 +1071,3 @@ service pcm {
@handler scheduleSituationHandler @handler scheduleSituationHandler
get /monitoring/schedule/situation returns (scheduleSituationResp) get /monitoring/schedule/situation returns (scheduleSituationResp)
} }

2
internal/logic/hpc/commithpctasklogic.go
View File

@ -30,7 +30,7 @@ func NewCommitHpcTaskLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Com
func (l *CommitHpcTaskLogic) CommitHpcTask(req *types.CommitHpcTaskReq) (resp *types.CommitHpcTaskResp, err error) { func (l *CommitHpcTaskLogic) CommitHpcTask(req *types.CommitHpcTaskReq) (resp *types.CommitHpcTaskResp, err error) {
var clusterInfo types.ClusterInfo var clusterInfo types.ClusterInfo
l.svcCtx.DbEngin.Raw("SELECT * FROM `t_cluster` where id = ? and label = ?", req.ClusterId, req.ClusterType).First(&clusterInfo) l.svcCtx.DbEngin.Raw("SELECT * FROM `t_cluster` where id = ?", req.ClusterId).First(&clusterInfo)
if len(clusterInfo.Id) == 0 { if len(clusterInfo.Id) == 0 {
resp.Code = 400 resp.Code = 400