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

hpc新增字段 

Former-commit-id: 5958b28a8285b807d4cf693d64e9cf313be41235
This commit is contained in:
zhangwei 2024-09-04 16:56:22 +08:00
parent 37afd2a284
commit c9a754e79b
5 changed files with 123 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desc/hpc/pcm-hpc.api
View File

@ -30,6 +30,7 @@ type (
StdInput string `json:"stdInput,optional"` StdInput string `json:"stdInput,optional"`
Environment map[string]string `json:"environment,optional"` Environment map[string]string `json:"environment,optional"`
ClusterType string `json:"clusterType,optional"` ClusterType string `json:"clusterType,optional"`
Partition string `json:"partition"`
} }
commitHpcTaskResp { commitHpcTaskResp {

20
etc/pcm.yaml
View File

@ -18,14 +18,12 @@ Monitoring:
#rpc #rpc
THRpcConf: THRpcConf:
target: nacos://10.206.0.12:8848/pcm.th.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api
# Endpoints: # Endpoints:
# - 127.0.0.1:8888 # - 127.0.0.1:8888
NonBlock: true NonBlock: true
#rpc #rpc
ModelArtsRpcConf: ModelArtsRpcConf:
# target: nacos://10.206.0.12:8848/pcm.modelarts.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api
Endpoints: Endpoints:
- 127.0.0.1:2002 - 127.0.0.1:2002
NonBlock: true NonBlock: true
@ -33,36 +31,31 @@ ModelArtsRpcConf:
#rpc #rpc
ModelArtsImgRpcConf: ModelArtsImgRpcConf:
target: nacos://10.206.0.12:8848/pcm.modelarts.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api Endpoints:
# Endpoints: - 127.0.0.1:2007
# - 127.0.0.1:2002
NonBlock: true NonBlock: true
#rpc #rpc
ACRpcConf: ACRpcConf:
target: nacos://10.206.0.12:8848/pcm.ac.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api Endpoints:
# Endpoints: - 127.0.0.1:8888
# - 127.0.0.1:8888
NonBlock: true NonBlock: true
Timeout: 50000 Timeout: 50000
#rpc #rpc
CephRpcConf: CephRpcConf:
# target: nacos://10.206.0.12:8848/pcm.ceph.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api
Endpoints: Endpoints:
- pcm-participant-ceph-service:2008 - pcm-participant-ceph-service:2008
NonBlock: true NonBlock: true
Timeout: 50000 Timeout: 50000
OctopusRpcConf: OctopusRpcConf:
target: nacos://10.206.0.12:8848/pcm.octopus.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api Endpoints:
# Endpoints: - 127.0.0.1:8888
# - 127.0.0.1:8888
NonBlock: true NonBlock: true
Timeout: 20000 Timeout: 20000
OpenstackRpcConf: OpenstackRpcConf:
# target: nacos://10.206.0.12:8848/pcm.openstack.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api
Endpoints: Endpoints:
- 127.0.0.1:2010 - 127.0.0.1:2010
NonBlock: true NonBlock: true
@ -70,7 +63,6 @@ OpenstackRpcConf:
# core rpc # core rpc
PcmCoreRpcConf: PcmCoreRpcConf:
# target: nacos://10.206.0.12:8848/pcm.core.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api
Endpoints: Endpoints:
- pcm-core-rpc:2004 - pcm-core-rpc:2004
NonBlock: true NonBlock: true

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

@ -90,6 +90,7 @@ func (l *CommitHpcTaskLogic) CommitHpcTask(req *types.CommitHpcTaskReq) (resp *t
StdOutFile: req.StdOutFile, StdOutFile: req.StdOutFile,
StdErrFile: req.StdErrFile, StdErrFile: req.StdErrFile,
StdInput: req.StdInput, StdInput: req.StdInput,
Partition: req.Partition,
DeletedFlag: 0, DeletedFlag: 0,
CreatedBy: 0, CreatedBy: 0,
CreatedTime: time.Now(), CreatedTime: time.Now(),

1
internal/types/types.go
View File

@ -1242,6 +1242,7 @@ type CommitHpcTaskReq struct {
StdInput string `json:"stdInput,optional"` StdInput string `json:"stdInput,optional"`
Environment map[string]string `json:"environment,optional"` Environment map[string]string `json:"environment,optional"`
ClusterType string `json:"clusterType,optional"` ClusterType string `json:"clusterType,optional"`
Partition string `json:"partition"`
} }
type CommitHpcTaskResp struct { type CommitHpcTaskResp struct {

1
pkg/models/taskhpcmodel_gen.go
View File

@ -71,6 +71,7 @@ type (
StdOutFile string `db:"std_out_file"` // 工作路径/std.err.%j StdOutFile string `db:"std_out_file"` // 工作路径/std.err.%j
StdErrFile string `db:"std_err_file"` // 工作路径/std.err.%j StdErrFile string `db:"std_err_file"` // 工作路径/std.err.%j
StdInput string `db:"std_input"` StdInput string `db:"std_input"`
Partition string `db:"partition"`
Environment string `db:"environment"` Environment string `db:"environment"`
DeletedFlag int64 `db:"deleted_flag"` // 是否删除（0-否，1-是） DeletedFlag int64 `db:"deleted_flag"` // 是否删除（0-否，1-是）
CreatedBy int64 `db:"created_by"` // 创建人 CreatedBy int64 `db:"created_by"` // 创建人