github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

fix clusterSyncLoop to always update services from latest cache

Browse Source
This commit is contained in:
mfanjie 2016-06-08 14:28:02 +08:00
parent 878c8d41f1
commit 640d7dc7d1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
federation/pkg/federation-controller/service/servicecontroller.go
View File

@ -235,7 +235,7 @@ func (s *ServiceController) Run(workers int, stopCh <-chan struct{}) error {
} }
go wait.Until(s.clusterEndpointWorker, time.Second, stopCh) go wait.Until(s.clusterEndpointWorker, time.Second, stopCh)
go wait.Until(s.clusterServiceWorker, time.Second, stopCh) go wait.Until(s.clusterServiceWorker, time.Second, stopCh)
go wait.Until(s.clusterSyncLoop, clusterSyncPeriod, stopCh) go wait.Until(s.clusterSyncLoop, time.Second, stopCh)
<-stopCh <-stopCh
glog.Infof("Shutting down Federation Service Controller") glog.Infof("Shutting down Federation Service Controller")
s.queue.ShutDown() s.queue.ShutDown()
@ -619,14 +619,14 @@ func (s *ServiceController) clusterSyncLoop() {
increase = newSet.Difference(s.knownClusterSet) increase = newSet.Difference(s.knownClusterSet)
// do nothing when cluster is removed. // do nothing when cluster is removed.
if increase != nil { if increase != nil {
for newCluster := range increase {
glog.Infof("New cluster observed %s", newCluster)
s.updateAllServicesToCluster(servicesToUpdate, newCluster)
}
// Try updating all services, and save the ones that fail to try again next // Try updating all services, and save the ones that fail to try again next
// round. // round.
servicesToUpdate = s.serviceCache.allServices() servicesToUpdate = s.serviceCache.allServices()
numServices := len(servicesToUpdate) numServices := len(servicesToUpdate)
for newCluster := range increase {
glog.Infof("New cluster observed %s", newCluster)
s.updateAllServicesToCluster(servicesToUpdate, newCluster)
}
servicesToUpdate = s.updateDNSRecords(servicesToUpdate, newClusters) servicesToUpdate = s.updateDNSRecords(servicesToUpdate, newClusters)
glog.Infof("Successfully updated %d out of %d DNS records to direct traffic to the updated cluster", glog.Infof("Successfully updated %d out of %d DNS records to direct traffic to the updated cluster",
numServices-len(servicesToUpdate), numServices) numServices-len(servicesToUpdate), numServices)
@ -638,7 +638,7 @@ func (s *ServiceController) updateAllServicesToCluster(services []*cachedService
cluster, ok := s.clusterCache.clientMap[clusterName] cluster, ok := s.clusterCache.clientMap[clusterName]
if ok { if ok {
for _, cachedService := range services { for _, cachedService := range services {
appliedState := cachedService.appliedState appliedState := cachedService.lastState
s.processServiceForCluster(cachedService, clusterName, appliedState, cluster.clientset) s.processServiceForCluster(cachedService, clusterName, appliedState, cluster.clientset)
} }
} }