Skip to content

Commit

Permalink
feat: set default cdn loadLimit
Browse files Browse the repository at this point in the history
Signed-off-by: santong <[email protected]>
  • Loading branch information
244372610 committed Aug 19, 2021
1 parent 396a898 commit 6b06ca6
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
12 changes: 6 additions & 6 deletions scheduler/scheduler.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ func (s *Server) Serve() error {
}()

// Serve Job
go func() {
if err := s.job.Serve(); err != nil {
logger.Fatalf("job start failed %v", err)
}
logger.Info("job start successfully")
}()
//go func() {
// if err := s.job.Serve(); err != nil {
// logger.Fatalf("job start failed %v", err)
// }
// logger.Info("job start successfully")
//}()

// Serve Keepalive
if s.managerClient != nil {
Expand Down
11 changes: 8 additions & 3 deletions scheduler/supervisor/cdn/reloadable_cdn_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ type refreshableCDNClient struct {
mu sync.RWMutex
cdnClient cdnclient.CdnClient
cdnHosts map[string]*supervisor.PeerHost
cdnConfig []*config.CDN
}

func (rcc *refreshableCDNClient) UpdateState(addrs []dfnet.NetAddr) {
Expand Down Expand Up @@ -82,6 +83,7 @@ func NewRefreshableCDNClient(dynConfig config.DynconfigInterface, opts []grpc.Di
rcc := &refreshableCDNClient{
cdnClient: cdnClient,
cdnHosts: cdnHosts,
cdnConfig: dynConfigData.CDNs,
}
dynConfig.Register(rcc)
return rcc, nil
Expand All @@ -94,10 +96,10 @@ func (rcc *refreshableCDNClient) OnNotify(c *config.DynconfigData) {
func (rcc *refreshableCDNClient) refresh(cdns []*config.CDN) {
rcc.mu.Lock()
defer rcc.mu.Unlock()
cdnHosts, netAddrs := cdnHostsToNetAddrs(cdns)
if reflect.DeepEqual(rcc.cdnHosts, cdnHosts) {
if reflect.DeepEqual(rcc.cdnConfig, cdns) {
return
}
cdnHosts, netAddrs := cdnHostsToNetAddrs(cdns)
rcc.cdnHosts = cdnHosts
// Sync CDNManager client netAddrs
rcc.cdnClient.UpdateState(netAddrs)
Expand All @@ -109,11 +111,14 @@ func cdnHostsToNetAddrs(hosts []*config.CDN) (map[string]*supervisor.PeerHost, [
netAddrs := make([]dfnet.NetAddr, 0, len(hosts))
for _, host := range hosts {
hostID := idgen.CDNUUID(host.HostName, host.Port)
if host.LoadLimit == 0 {
host.LoadLimit = 100
}
cdnHostMap[hostID] = supervisor.NewCDNPeerHost(hostID, host.IP, host.HostName, host.Port, host.DownloadPort, host.SecurityGroup, host.Location,
host.IDC, host.NetTopology, host.LoadLimit)
netAddrs = append(netAddrs, dfnet.NetAddr{
Type: dfnet.TCP,
Addr: fmt.Sprintf("%s:%d", host.HostName, host.Port),
Addr: fmt.Sprintf("%s:%d", host.IP, host.Port),
})
}
return cdnHostMap, netAddrs
Expand Down

0 comments on commit 6b06ca6

Please sign in to comment.