github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 13:42:02 +00:00
Code Issues Projects Releases Wiki Activity

Moves string slice sorting, copying and shuffling into pkg/util/slice

Browse Source
This commit is contained in:
Steve Reed
2015-01-22 14:12:37 -08:00
parent 38241c7e80
commit f7e3cb12a6
4 changed files with 108 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/proxy/roundrobin.go
View File

@@ -18,15 +18,14 @@ package proxy
import (
"errors"
"math/rand"
"net"
"reflect"
"sort"
"strconv"
"sync"
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util/slice"
"github.com/golang/glog"
)
@@ -172,30 +171,6 @@ func filterValidEndpoints(endpoints []string) []string {
return result
}
func endpointsAreEqual(left, right []string) bool {
if len(left) != len(right) {
return false
}
leftSorted := make([]string, len(left))
copy(leftSorted, left)
sort.Strings(leftSorted)
rightSorted := make([]string, len(right))
copy(rightSorted, right)
sort.Strings(rightSorted)
return reflect.DeepEqual(leftSorted, rightSorted)
}
func shuffleEndpoints(endpoints []string) []string {
shuffled := make([]string, len(endpoints))
perm := rand.Perm(len(endpoints))
for i, v := range perm {
shuffled[v] = endpoints[i]
}
return shuffled
}
//remove any session affinity records associated to a particular endpoint (for example when a pod goes down).
func removeSessionAffinityByEndpoint(lb *LoadBalancerRR, service string, endpoint string) {
for _, affinityDetail := range lb.serviceDtlMap[service].sessionAffinityMap {
@@ -236,14 +211,14 @@ func (lb *LoadBalancerRR) OnUpdate(endpoints []api.Endpoints) {
for _, endpoint := range endpoints {
existingEndpoints, exists := lb.endpointsMap[endpoint.Name]
validEndpoints := filterValidEndpoints(endpoint.Endpoints)
if !exists || !endpointsAreEqual(existingEndpoints, validEndpoints) {
if !exists || !reflect.DeepEqual(slice.SortStrings(slice.CopyStrings(existingEndpoints)), slice.SortStrings(validEndpoints)) {
glog.V(3).Infof("LoadBalancerRR: Setting endpoints for %s to %+v", endpoint.Name, endpoint.Endpoints)
updateServiceDetailMap(lb, endpoint.Name, validEndpoints)
// On update can be called without NewService being called externally.
// to be safe we will call it here. A new service will only be created
// if one does not already exist.
lb.NewService(endpoint.Name, api.AffinityTypeNone, 0)
lb.endpointsMap[endpoint.Name] = shuffleEndpoints(validEndpoints)
lb.endpointsMap[endpoint.Name] = slice.ShuffleStrings(validEndpoints)
// Reset the round-robin index.
lb.rrIndex[endpoint.Name] = 0

21
pkg/proxy/roundrobin_test.go
View File

@@ -18,7 +18,6 @@ package proxy
import (
"net"
"sort"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@@ -57,26 +56,6 @@ func TestFilterWorks(t *testing.T) {
}
}
func TestShuffleWorks(t *testing.T) {
endpoints := []string{"foobar:1", "foobar:2", "foobar:3"}
shuffled := shuffleEndpoints(endpoints)
if len(shuffled) != 3 {
t.Errorf("Failed to shuffle to the correct size")
}
sort.Strings(shuffled)
if shuffled[0] != "foobar:1" {
t.Errorf("Index zero is not foobar:1")
}
if shuffled[1] != "foobar:2" {
t.Errorf("Index one is not foobar:2")
}
if shuffled[2] != "foobar:3" {
t.Errorf("Index two is not foobar:3")
}
}
func TestLoadBalanceFailsWithNoEndpoints(t *testing.T) {
loadBalancer := NewLoadBalancerRR()
var endpoints []api.Endpoints