github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28568 from xiangpengzhao/check_ensureDnsRecords_return_value

Browse Source 
Automatic merge from submit-queue

Check return value when calling ensureDnsRecords

When [lockedUpdateDNSRecords](https://github.com/xiangpengzhao/kubernetes/blob/check_ensureDnsRecords_return_value/federation/pkg/federation-controller/service/servicecontroller.go#L723) calls `ensureDnsRecords`, it should check the return value. If it returns error, the `ensuredCount ` should not increment.
This commit is contained in:
Kubernetes Submit Queue 2016-08-18 16:25:09 -07:00 committed by GitHub
commit 83ded2858c
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -724,18 +724,26 @@ func (s *ServiceController) lockedUpdateDNSRecords(service *cachedService, clust
if !wantsDNSRecords(service.appliedState) { if !wantsDNSRecords(service.appliedState) {
return nil return nil
} }
ensuredCount := 0 ensuredCount := 0
unensuredCount := 0
for key := range s.clusterCache.clientMap { for key := range s.clusterCache.clientMap {
for _, clusterName := range clusterNames { for _, clusterName := range clusterNames {
if key == clusterName { if key == clusterName {
s.ensureDnsRecords(clusterName, service) err := s.ensureDnsRecords(clusterName, service)
if err != nil {
unensuredCount += 1
glog.V(4).Infof("Failed to update DNS records for service %v from cluster %s: %v", service, clusterName, err)
} else {
ensuredCount += 1 ensuredCount += 1
} }
} }
} }
if ensuredCount < len(clusterNames) { }
return fmt.Errorf("Failed to update DNS records for %d of %d clusters for service %v due to missing clients for those clusters", missedCount := len(clusterNames) - ensuredCount - unensuredCount
len(clusterNames)-ensuredCount, len(clusterNames), service) if missedCount > 0 || unensuredCount > 0 {
return fmt.Errorf("Failed to update DNS records for %d clusters for service %v due to missing clients [missed count: %d] and/or failing to ensure DNS records [unensured count: %d]",
len(clusterNames), service, missedCount, unensuredCount)
} }
return nil return nil
} }