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

Merge pull request 'modify parameters' (#47) from qiwang/pcm-coordinator:master into master 

Former-commit-id: 3987ef138059d0c4be8e3ec8f72362f4faab69b8
This commit is contained in:
qiwang 2024-03-12 17:06:41 +08:00
parent 1dfff160ae 24ff6528ab
commit 9781b44f88
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/desc/vm/pcm-vm.api
View File

@ -36,8 +36,6 @@ type (
absolute Absolute `json:"absolute,optional"` absolute Absolute `json:"absolute,optional"`
} }
GetComputeLimitsReq { GetComputeLimitsReq {
Limit int32 `json:"limit,optional"`
OffSet int32 `json:"offSet,optional"`
Platform string `json:"platform,optional"` Platform string `json:"platform,optional"`
} }
@ -68,8 +66,6 @@ type (
absolute VolumeAbsolute `json:"absolute,optional"` absolute VolumeAbsolute `json:"absolute,optional"`
} }
GetVolumeLimitsReq { GetVolumeLimitsReq {
Limit int32 `json:"limit,optional"`
OffSet int32 `json:"offSet,optional"`
Platform string `json:"platform,optional"` Platform string `json:"platform,optional"`
} }

11
api/etc/pcm.yaml
View File

@ -5,7 +5,7 @@ Port: 8999
Timeout: 50000 Timeout: 50000
DB: DB:
DataSource: root:uJpLd6u-J?HC1@(47.92.88.143:3306)/pcm?parseTime=true&loc=Local DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true&loc=Local
Redis: Redis:
Host: 10.206.0.12:6379 Host: 10.206.0.12:6379
@ -67,9 +67,12 @@ OctopusRpcConf:
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 # target: nacos://10.206.0.12:8848/pcm.openstack.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api
# Endpoints: # target: nacos://127.0.0.1:8848/pcm.openstack.rpc?timeout=30s&namespaceid=test&groupname=DEFAULT_GROUP&appName=pcm.core.api
# - 127.0.0.1:8888 #Endpoints:
#- 127.0.0.1:2010
Endpoints:
- 127.0.0.1:2010
NonBlock: true NonBlock: true
Timeout: 20000 Timeout: 20000

4
api/internal/types/types.go
View File

@ -2488,8 +2488,6 @@ type Limits struct {
} }
type GetComputeLimitsReq struct { type GetComputeLimitsReq struct {
Limit int32 `json:"limit,optional"`
OffSet int32 `json:"offSet,optional"`
Platform string `json:"platform,optional"` Platform string `json:"platform,optional"`
} }
@ -2522,8 +2520,6 @@ type VolumeLimits struct {
} }
type GetVolumeLimitsReq struct { type GetVolumeLimitsReq struct {
Limit int32 `json:"limit,optional"`
OffSet int32 `json:"offSet,optional"`
Platform string `json:"platform,optional"` Platform string `json:"platform,optional"`
} }

3
rpc/etc/pcmcore.yaml
View File

@ -4,7 +4,8 @@ ListenOn: 0.0.0.0:2004
Timeout: 15000 # 15s，设置rpc服务的响应的超时时间，若超过15s还未返回则结束请求 Timeout: 15000 # 15s，设置rpc服务的响应的超时时间，若超过15s还未返回则结束请求
DB: DB:
DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true # DataSource: root:uJpLd6u-J?HC1@(10.206.0.12:3306)/pcm?parseTime=true
DataSource: root:uJpLd6u-J?HC1@(47.92.88.143:3306)/pcm?parseTime=true
#链路追踪 #链路追踪
# Telemetry: # Telemetry: