监控数据类型修改

Former-commit-id: a4c90176ce30828b485ec2330b7f003b5ef9c17b
This commit is contained in:
彭硕 2023-07-27 09:55:16 +08:00
parent ad3a651558
commit 966574e593
5 changed files with 395 additions and 399 deletions

2
go.mod
View File

@ -19,6 +19,7 @@ require (
gitlink.org.cn/jcce-pcm/pcm-participant-modelarts v0.0.0-20230714013255-149a9b428b28
gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20230714012611-c66005610d0c
gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714015940-004100bfa168
gitlink.org.cn/jcce-pcm/utils v0.0.0-20230725025032-ac218fa4db06
google.golang.org/grpc v1.56.2
google.golang.org/protobuf v1.31.0
gorm.io/driver/mysql v1.5.1
@ -90,7 +91,6 @@ require (
github.com/prometheus/procfs v0.9.0 // indirect
github.com/segmentio/kafka-go v0.4.38 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
gitlink.org.cn/jcce-pcm/utils v0.0.0-20230725025032-ac218fa4db06 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // indirect

4
go.sum
View File

@ -1037,12 +1037,8 @@ gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20230714012611-c66005610d
gitlink.org.cn/jcce-pcm/pcm-participant-octopus v0.0.0-20230714012611-c66005610d0c/go.mod h1:9Ad9vxCPGbY1yF1NhHWL2EhxsXJBB6bzz9i7PeSfKG4=
gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714015940-004100bfa168 h1:BgTVUqJMOhdm6mNPx1ti5ClTnyMjZlCvH0avI1dz1xg=
gitlink.org.cn/jcce-pcm/pcm-participant-slurm v0.0.0-20230714015940-004100bfa168/go.mod h1:lY3jXmmMvC7j4Q2ogliThURWp9c1XCToSCnRkdc1aW8=
gitlink.org.cn/jcce-pcm/utils v0.0.0-20230724072501-2a0519bd57bd h1:A9i6TPZ58OwycgWNQpIMrjSIMK8lXmmakig7IkonrVA=
gitlink.org.cn/jcce-pcm/utils v0.0.0-20230724072501-2a0519bd57bd/go.mod h1:zTa+selMe02jZ3u6Ij1rTF2CrGd2ZqzqyMQ/FwhdpvY=
gitlink.org.cn/jcce-pcm/utils v0.0.0-20230725025032-ac218fa4db06 h1:mjt1ynoyzyowzm+pUXZKptoSHqjGyzw6uNCQzeHo1/g=
gitlink.org.cn/jcce-pcm/utils v0.0.0-20230725025032-ac218fa4db06/go.mod h1:u8PTlBpzUyOlbQJgfSiutq91q/JtrJIQiPNDe4S/pGs=
gitlink.org.cn/jcce-pcm/utils v0.0.1 h1:3PH93Z/JFTH5JRO9MFf3dD1Gnd12aGiIIViWBlQGuhE=
gitlink.org.cn/jcce-pcm/utils v0.0.1/go.mod h1:5cwaaqM0+HK5GXVbYozGlWvgwoUby0KytdvhbwQW1ks=
go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8=
go.etcd.io/etcd/api/v3 v3.5.7/go.mod h1:9qew1gCdDDLu+VwmeG+iFpL+QlpHTo7iubavdVDgCAA=
go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs=

View File

@ -165,9 +165,9 @@ message ParticipantHeartbeatReq{
message ParticipantAvailReq{
int64 id = 1; //id
int64 availStorageSpace = 2; //
int32 userNum = 3; //
int32 pendingJobNum = 4; //
int32 runningJobNum = 5; //
int64 userNum = 3; //
int64 pendingJobNum = 4; //
int64 runningJobNum = 5; //
int64 participantId = 6; //id
repeated NodeAvailInfo nodeAvailInfo = 7; //
}
@ -176,14 +176,14 @@ message ParticipantAvailReq{
message NodeAvailInfo{
int64 id = 1; //id
string nodeName = 2; //
int32 cpuTotal = 3; //cpu核数
int64 cpuTotal = 3; //cpu核数
double cpuUsable = 4; //cpu可用率
int32 diskTotal = 5; //
int32 diskAvail = 6; //
int32 memTotal = 7; //
int32 memAvail = 8; //
int32 gpuTotal = 9; //gpu总数
int32 gpuAvail = 10; //gpu可用数
int64 diskTotal = 5; //
int64 diskAvail = 6; //
int64 memTotal = 7; //
int64 memAvail = 8; //
int64 gpuTotal = 9; //gpu总数
int64 gpuAvail = 10; //gpu可用数
int64 participantAvailId = 11; //id
}

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.3.0
// - protoc v4.23.4
// source: pb/pcmCore.proto
// - protoc v3.19.4
// source: pcmCore.proto
package pcmCore
@ -146,7 +146,7 @@ var PcmCore_ServiceDesc = grpc.ServiceDesc{
},
},
Streams: []grpc.StreamDesc{},
Metadata: "pb/pcmCore.proto",
Metadata: "pcmCore.proto",
}
const (
@ -316,5 +316,5 @@ var ParticipantService_ServiceDesc = grpc.ServiceDesc{
},
},
Streams: []grpc.StreamDesc{},
Metadata: "pb/pcmCore.proto",
Metadata: "pcmCore.proto",
}