Skip to content

Commit

Permalink
feat: seed peer add object storage port (#1408)
Browse files Browse the repository at this point in the history 
Signed-off-by: Gaius <gaius.qi@gmail.com>
  • Loading branch information
@gaius-qi
gaius-qi committed Jun 23, 2022
1 parent 2f07346 commit 33d46ca
Show file tree
Hide file tree
Showing 11 changed files with 85 additions and 5 deletions.
9 changes: 9 additions & 0 deletions api/manager/docs.go
View file
Expand Up @@ -3973,6 +3973,9 @@ const docTemplate = `{
"net_topology": {
"type": "string"
},
"object_storage_port": {
"type": "integer"
},
"port": {
"type": "integer"
},
Expand Down Expand Up @@ -4404,6 +4407,9 @@ const docTemplate = `{
"net_topology": {
"type": "string"
},
"object_storage_port": {
"type": "integer"
},
"port": {
"type": "integer"
},
Expand Down Expand Up @@ -4812,6 +4818,9 @@ const docTemplate = `{
"net_topology": {
"type": "string"
},
"object_storage_port": {
"type": "integer"
},
"port": {
"type": "integer"
},
Expand Down
9 changes: 9 additions & 0 deletions api/manager/swagger.json
View file
Expand Up @@ -3966,6 +3966,9 @@
"net_topology": {
"type": "string"
},
"object_storage_port": {
"type": "integer"
},
"port": {
"type": "integer"
},
Expand Down Expand Up @@ -4397,6 +4400,9 @@
"net_topology": {
"type": "string"
},
"object_storage_port": {
"type": "integer"
},
"port": {
"type": "integer"
},
Expand Down Expand Up @@ -4805,6 +4811,9 @@
"net_topology": {
"type": "string"
},
"object_storage_port": {
"type": "integer"
},
"port": {
"type": "integer"
},
Expand Down
6 changes: 6 additions & 0 deletions api/manager/swagger.yaml
View file
Expand Up @@ -189,6 +189,8 @@ definitions:
type: string
net_topology:
type: string
object_storage_port:
type: integer
port:
type: integer
seedPeerClusterID:
Expand Down Expand Up @@ -473,6 +475,8 @@ definitions:
type: string
net_topology:
type: string
object_storage_port:
type: integer
port:
type: integer
seed_peer_cluster_id:
Expand Down Expand Up @@ -754,6 +758,8 @@ definitions:
type: string
net_topology:
type: string
object_storage_port:
type: integer
port:
type: integer
seed_peer_cluster_id:
Expand Down
1 change: 1 addition & 0 deletions manager/model/seed_peer.go
View file
Expand Up @@ -37,6 +37,7 @@ type SeedPeer struct {
IP string `gorm:"column:ip;type:varchar(256);not null;comment:ip address" json:"ip"`
Port int32 `gorm:"column:port;not null;comment:grpc service listening port" json:"port"`
DownloadPort int32 `gorm:"column:download_port;not null;comment:download service listening port" json:"download_port"`
ObjectStoragePort int32 `gorm:"column:object_storage_port;comment:object storage service listening port" json:"object_storage_port"`
State string `gorm:"column:state;type:varchar(256);default:'inactive';comment:service state" json:"state"`
SeedPeerClusterID uint `gorm:"index:uk_seed_peer,unique;not null;comment:seed peer cluster id"`
SeedPeerCluster SeedPeerCluster `json:"-"`
Expand Down
7 changes: 7 additions & 0 deletions manager/rpcserver/rpcserver.go
View file
Expand Up @@ -170,6 +170,7 @@ func (s *Server) GetSeedPeer(ctx context.Context, req *manager.GetSeedPeerReques
Ip: seedPeer.IP,
Port: seedPeer.Port,
DownloadPort: seedPeer.DownloadPort,
ObjectStoragePort: seedPeer.ObjectStoragePort,
State: seedPeer.State,
SeedPeerClusterId: uint64(seedPeer.SeedPeerClusterID),
SeedPeerCluster: &manager.SeedPeerCluster{
Expand Down Expand Up @@ -215,6 +216,7 @@ func (s *Server) UpdateSeedPeer(ctx context.Context, req *manager.UpdateSeedPeer
IP: req.Ip,
Port: req.Port,
DownloadPort: req.DownloadPort,
ObjectStoragePort: req.ObjectStoragePort,
SeedPeerClusterID: uint(req.SeedPeerClusterId),
}).Error; err != nil {
return nil, status.Error(codes.Unknown, err.Error())
Expand All @@ -237,6 +239,7 @@ func (s *Server) UpdateSeedPeer(ctx context.Context, req *manager.UpdateSeedPeer
Ip: seedPeer.IP,
Port: seedPeer.Port,
DownloadPort: seedPeer.DownloadPort,
ObjectStoragePort: seedPeer.ObjectStoragePort,
State: seedPeer.State,
SeedPeerClusterId: uint64(seedPeer.SeedPeerClusterID),
}, nil
Expand All @@ -253,6 +256,7 @@ func (s *Server) createSeedPeer(ctx context.Context, req *manager.UpdateSeedPeer
IP: req.Ip,
Port: req.Port,
DownloadPort: req.DownloadPort,
ObjectStoragePort: req.ObjectStoragePort,
SeedPeerClusterID: uint(req.SeedPeerClusterId),
}

Expand All @@ -270,6 +274,7 @@ func (s *Server) createSeedPeer(ctx context.Context, req *manager.UpdateSeedPeer
Ip: seedPeer.IP,
Port: seedPeer.Port,
DownloadPort: seedPeer.DownloadPort,
ObjectStoragePort: seedPeer.ObjectStoragePort,
SeedPeerClusterId: uint64(seedPeer.SeedPeerClusterID),
State: seedPeer.State,
}, nil
Expand Down Expand Up @@ -329,6 +334,7 @@ func (s *Server) GetScheduler(ctx context.Context, req *manager.GetSchedulerRequ
Ip: seedPeer.IP,
Port: seedPeer.Port,
DownloadPort: seedPeer.DownloadPort,
ObjectStoragePort: seedPeer.ObjectStoragePort,
State: seedPeer.State,
SeedPeerClusterId: uint64(seedPeer.SeedPeerClusterID),
SeedPeerCluster: &manager.SeedPeerCluster{
Expand Down Expand Up @@ -510,6 +516,7 @@ func (s *Server) ListSchedulers(ctx context.Context, req *manager.ListSchedulers
Ip: seedPeer.IP,
Port: seedPeer.Port,
DownloadPort: seedPeer.DownloadPort,
ObjectStoragePort: seedPeer.ObjectStoragePort,
State: seedPeer.State,
SeedPeerClusterId: uint64(seedPeer.SeedPeerClusterID),
})
Expand Down
3 changes: 3 additions & 0 deletions manager/service/seed_peer.go
View file
Expand Up @@ -33,6 +33,7 @@ func (s *service) CreateSeedPeer(ctx context.Context, json types.CreateSeedPeerR
IP: json.IP,
Port: json.Port,
DownloadPort: json.DownloadPort,
ObjectStoragePort: json.ObjectStoragePort,
SeedPeerClusterID: json.SeedPeerClusterID,
}

Expand Down Expand Up @@ -66,6 +67,7 @@ func (s *service) UpdateSeedPeer(ctx context.Context, id uint, json types.Update
IP: json.IP,
Port: json.Port,
DownloadPort: json.DownloadPort,
ObjectStoragePort: json.ObjectStoragePort,
SeedPeerClusterID: json.SeedPeerClusterID,
}).Error; err != nil {
return nil, err
Expand Down Expand Up @@ -94,6 +96,7 @@ func (s *service) GetSeedPeers(ctx context.Context, q types.GetSeedPeersQuery) (
IP: q.IP,
Port: q.Port,
DownloadPort: q.DownloadPort,
ObjectStoragePort: q.ObjectStoragePort,
SeedPeerClusterID: q.SeedPeerClusterID,
}).Find(&seedPeers).Limit(-1).Offset(-1).Count(&count).Error; err != nil {
return nil, 0, err
Expand Down
3 changes: 3 additions & 0 deletions manager/types/seed_peer.go
View file
Expand Up @@ -29,6 +29,7 @@ type CreateSeedPeerRequest struct {
IP string `json:"ip" binding:"required"`
Port int32 `json:"port" binding:"required"`
DownloadPort int32 `json:"download_port" binding:"required"`
ObjectStoragePort int32 `json:"object_storage_port" binding:"omitempty"`
SeedPeerClusterID uint `json:"seed_peer_cluster_id" binding:"required"`
}

Expand All @@ -40,6 +41,7 @@ type UpdateSeedPeerRequest struct {
IP string `json:"ip" binding:"omitempty"`
Port int32 `json:"port" binding:"omitempty"`
DownloadPort int32 `json:"download_port" binding:"omitempty"`
ObjectStoragePort int32 `json:"object_storage_port" binding:"omitempty"`
SeedPeerClusterID uint `json:"seed_peer_cluster_id" binding:"omitempty"`
}

Expand All @@ -51,6 +53,7 @@ type GetSeedPeersQuery struct {
IP string `form:"ip" binding:"omitempty"`
Port int32 `form:"port" binding:"omitempty"`
DownloadPort int32 `form:"download_port" binding:"omitempty"`
ObjectStoragePort int32 `form:"object_storage_port" binding:"omitempty"`
SeedPeerClusterID uint `form:"seed_peer_cluster_id" binding:"omitempty"`
Page int `form:"page" binding:"omitempty,gte=1"`
PerPage int `form:"per_page" binding:"omitempty,gte=1,lte=50"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/rpc/manager/client/mocks/client_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 29 additions & 4 deletions pkg/rpc/manager/manager.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions pkg/rpc/manager/manager.pb.validate.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/rpc/manager/manager.proto
View file
Expand Up @@ -91,6 +91,8 @@ message SeedPeer {
SeedPeerCluster seed_peer_cluster = 13;
// Schedulers included in seed peer.
repeated Scheduler schedulers = 14;
// Seed peer object storage port.
int32 object_storage_port = 15;
}

// GetSeedPeerRequest represents request of GetSeedPeer.
Expand Down Expand Up @@ -125,6 +127,8 @@ message UpdateSeedPeerRequest {
int32 download_port = 10 [(validate.rules).int32 = {gte: 1024, lt: 65535}];
// ID of the cluster to which the seed peer belongs.
uint64 seed_peer_cluster_id = 11 [(validate.rules).uint64 = {gte: 1}];
// Seed peer object storage port.
int32 object_storage_port = 12 [(validate.rules).int32 = {gte: 1024, lt: 65535, ignore_empty: true}];
}

// SeedPeerCluster represents cluster of scheduler.
Expand Down

0 comments on commit 33d46ca

Please sign in to comment.