Merge pull request #48635 from dcbw/userspace-proxy-silence-loadbalancerrr-message

Automatic merge from submit-queue (batch tested with PRs 48425, 41680, 48457, 48619, 48635) proxy/userspace: suppress "LoadBalancerRR: Removing endpoints" message Don't print it when there aren't any endpoints getting removed. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1468420 Fixes: https://github.com/kubernetes/kubernetes/issues/48816 ```release-note NONE ``` @eparis @thockin @kubernetes/rh-networking

Merge pull request #48635 from dcbw/userspace-proxy-silence-loadbalancerrr-message
8c52c8f1 · Kubernetes Submit Queue · GitHub · fc4f1c43 · 0233f2b9 · 8c52c8f1
Commit 8c52c8f1 authored Jul 12, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 11 deletions

roundrobin.go pkg/proxy/userspace/roundrobin.go +12 -11

No files found.
--- a/pkg/proxy/userspace/roundrobin.go
+++ b/pkg/proxy/userspace/roundrobin.go
@@ -326,13 +326,20 @@ func (lb *LoadBalancerRR) OnEndpointsUpdate(oldEndpoints, endpoints *api.Endpoin
 	for portname := range oldPortsToEndpoints {
 		svcPort := proxy.ServicePortName{NamespacedName: types.NamespacedName{Namespace: oldEndpoints.Namespace, Name: oldEndpoints.Name}, Port: portname}
 		if _, exists := registeredEndpoints[svcPort]; !exists {
+			lb.resetService(svcPort)
+		}
+	}
+}
+func (lb *LoadBalancerRR) resetService(svcPort proxy.ServicePortName) {
+	// If the service is still around, reset but don't delete.
+	if state, ok := lb.services[svcPort]; ok {
+		if len(state.endpoints) > 0 {
 			glog.V(2).Infof("LoadBalancerRR: Removing endpoints for %s", svcPort)
-			// Reset but don't delete.
-			state := lb.services[svcPort]
 			state.endpoints = []string{}
-			state.index = 0
-			state.affinity.affinityMap = map[string]*affinityState{}
 		}
+		state.index = 0
+		state.affinity.affinityMap = map[string]*affinityState{}
 	}
 }
@@ -344,13 +351,7 @@ func (lb *LoadBalancerRR) OnEndpointsDelete(endpoints *api.Endpoints) {
 	for portname := range portsToEndpoints {
 		svcPort := proxy.ServicePortName{NamespacedName: types.NamespacedName{Namespace: endpoints.Namespace, Name: endpoints.Name}, Port: portname}
-		glog.V(2).Infof("LoadBalancerRR: Removing endpoints for %s", svcPort)
+		lb.resetService(svcPort)
-		// If the service is still around, reset but don't delete.
-		if state, ok := lb.services[svcPort]; ok {
-			state.endpoints = []string{}
-			state.index = 0
-			state.affinity.affinityMap = map[string]*affinityState{}
-		}
 	}
 }