dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: add seed peer for list scheduler grpc interface (#1393) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2022-06-16 18:16:21 +08:00
parent 9cabf7638e
commit d392b9f8aa
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manager/rpcserver/rpcserver.go
View File

@ -480,7 +480,7 @@ func (s *Server) ListSchedulers(ctx context.Context, req *manager.ListSchedulers
// Cache miss. // Cache miss.
log.Infof("%s cache miss", cacheKey) log.Infof("%s cache miss", cacheKey)
var schedulerClusters []model.SchedulerCluster var schedulerClusters []model.SchedulerCluster
if err := s.db.WithContext(ctx).Preload("SecurityGroup.SecurityRules").Preload("Schedulers", "state = ?", "active").Find(&schedulerClusters).Error; err != nil { if err := s.db.WithContext(ctx).Preload("SecurityGroup.SecurityRules").Preload("SeedPeerClusters.SeedPeers", "state = ?", "active").Preload("Schedulers", "state = ?", "active").Find(&schedulerClusters).Error; err != nil {
return nil, status.Error(codes.Unknown, err.Error()) return nil, status.Error(codes.Unknown, err.Error())
} }
@ -496,12 +496,33 @@ func (s *Server) ListSchedulers(ctx context.Context, req *manager.ListSchedulers
schedulers := []model.Scheduler{} schedulers := []model.Scheduler{}
for _, schedulerCluster := range schedulerClusters { for _, schedulerCluster := range schedulerClusters {
for _, scheduler := range schedulerCluster.Schedulers { for _, scheduler := range schedulerCluster.Schedulers {
scheduler.SchedulerCluster = schedulerCluster
schedulers = append(schedulers, scheduler) schedulers = append(schedulers, scheduler)
} }
} }
// Construct schedulers. // Construct schedulers.
for _, scheduler := range schedulers { for _, scheduler := range schedulers {
seedPeers := []*manager.SeedPeer{}
for _, seedPeerCluster := range scheduler.SchedulerCluster.SeedPeerClusters {
for _, seedPeer := range seedPeerCluster.SeedPeers {
seedPeers = append(seedPeers, &manager.SeedPeer{
Id: uint64(seedPeer.ID),
HostName: seedPeer.HostName,
Type: seedPeer.Type,
IsCdn: seedPeer.IsCDN,
Idc: seedPeer.IDC,
NetTopology: seedPeer.NetTopology,
Location: seedPeer.Location,
Ip: seedPeer.IP,
Port: seedPeer.Port,
DownloadPort: seedPeer.DownloadPort,
State: seedPeer.State,
SeedPeerClusterId: uint64(seedPeer.SeedPeerClusterID),
})
}
}
pbListSchedulersResponse.Schedulers = append(pbListSchedulersResponse.Schedulers, &manager.Scheduler{ pbListSchedulersResponse.Schedulers = append(pbListSchedulersResponse.Schedulers, &manager.Scheduler{
Id: uint64(scheduler.ID), Id: uint64(scheduler.ID),
HostName: scheduler.HostName, HostName: scheduler.HostName,
@ -512,6 +533,7 @@ func (s *Server) ListSchedulers(ctx context.Context, req *manager.ListSchedulers
Port: scheduler.Port, Port: scheduler.Port,
State: scheduler.State, State: scheduler.State,
SchedulerClusterId: uint64(scheduler.SchedulerClusterID), SchedulerClusterId: uint64(scheduler.SchedulerClusterID),
SeedPeers: seedPeers,
}) })
} }