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

Merge pull request #108259 from carlosdamazio/refactor/roundrobin

Browse Source 
pkg/proxy/userspace/roundrobin: Make `lb.services` nil check standardized
This commit is contained in:
Kubernetes Prow Robot 2022-05-26 08:45:23 -07:00 committed by GitHub
commit 4a2391caf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/proxy/userspace/roundrobin.go
View File

@ -96,7 +96,7 @@ func (lb *LoadBalancerRR) newServiceInternal(svcPort proxy.ServicePortName, affi
ttlSeconds = int(v1.DefaultClientIPServiceAffinitySeconds) //default to 3 hours if not specified. Should 0 be unlimited instead???? ttlSeconds = int(v1.DefaultClientIPServiceAffinitySeconds) //default to 3 hours if not specified. Should 0 be unlimited instead????
} }
if _, exists := lb.services[svcPort]; !exists { if state, exists := lb.services[svcPort]; !exists || state == nil {
lb.services[svcPort] = &balancerState{affinity: *newAffinityPolicy(affinityType, ttlSeconds)} lb.services[svcPort] = &balancerState{affinity: *newAffinityPolicy(affinityType, ttlSeconds)}
klog.V(4).InfoS("LoadBalancerRR service does not exist, created", "servicePortName", svcPort) klog.V(4).InfoS("LoadBalancerRR service does not exist, created", "servicePortName", svcPort)
} else if affinityType != "" { } else if affinityType != "" {
@ -126,9 +126,10 @@ func (lb *LoadBalancerRR) ServiceHasEndpoints(svcPort proxy.ServicePortName) boo
lb.lock.RLock() lb.lock.RLock()
defer lb.lock.RUnlock() defer lb.lock.RUnlock()
state, exists := lb.services[svcPort] state, exists := lb.services[svcPort]
// TODO: while nothing ever assigns nil to the map, *some* of the code using the map if !exists || state == nil {
// checks for it. The code should all follow the same convention. return false
return exists && state != nil && len(state.endpoints) > 0 }
return len(state.endpoints) > 0
} }
// NextEndpoint returns a service endpoint. // NextEndpoint returns a service endpoint.
@ -209,7 +210,7 @@ func (lb *LoadBalancerRR) removeStaleAffinity(svcPort proxy.ServicePortName, new
} }
state, exists := lb.services[svcPort] state, exists := lb.services[svcPort]
if !exists { if !exists || state == nil {
return return
} }
for _, existingEndpoint := range state.endpoints { for _, existingEndpoint := range state.endpoints {
@ -290,7 +291,7 @@ func (lb *LoadBalancerRR) OnEndpointsUpdate(oldEndpoints, endpoints *v1.Endpoint
func (lb *LoadBalancerRR) resetService(svcPort proxy.ServicePortName) { func (lb *LoadBalancerRR) resetService(svcPort proxy.ServicePortName) {
// If the service is still around, reset but don't delete. // If the service is still around, reset but don't delete.
if state, ok := lb.services[svcPort]; ok { if state, ok := lb.services[svcPort]; ok && state != nil {
if len(state.endpoints) > 0 { if len(state.endpoints) > 0 {
klog.V(2).InfoS("LoadBalancerRR: Removing endpoints service", "servicePortName", svcPort) klog.V(2).InfoS("LoadBalancerRR: Removing endpoints service", "servicePortName", svcPort)
state.endpoints = []string{} state.endpoints = []string{}
@ -330,7 +331,7 @@ func (lb *LoadBalancerRR) CleanupStaleStickySessions(svcPort proxy.ServicePortNa
defer lb.lock.Unlock() defer lb.lock.Unlock()
state, exists := lb.services[svcPort] state, exists := lb.services[svcPort]
if !exists { if !exists || state == nil {
return return
} }
for ip, affinity := range state.affinity.affinityMap { for ip, affinity := range state.affinity.affinityMap {