github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass obj with lock by reference. Methods->funcs. 

Fixes "lock passed by value" issues raised by "go vet".
pull/6/head
Eric Tune 2014-08-14 11:09:08 -07:00
parent e5e4c8a7d3
commit ee91a19f90
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/proxy/roundrobin.go
View File

@ -49,7 +49,7 @@ func NewLoadBalancerRR() *LoadBalancerRR {
// NextEndpoint returns a service endpoint. // NextEndpoint returns a service endpoint.
// The service endpoint is chosen using the round-robin algorithm. // The service endpoint is chosen using the round-robin algorithm.
func (lb LoadBalancerRR) NextEndpoint(service string, srcAddr net.Addr) (string, error) { func (lb *LoadBalancerRR) NextEndpoint(service string, srcAddr net.Addr) (string, error) {
lb.lock.RLock() lb.lock.RLock()
endpoints, exists := lb.endpointsMap[service] endpoints, exists := lb.endpointsMap[service]
index := lb.rrIndex[service] index := lb.rrIndex[service]
@ -67,7 +67,7 @@ func (lb LoadBalancerRR) NextEndpoint(service string, srcAddr net.Addr) (string,
return endpoint, nil return endpoint, nil
} }
func (lb LoadBalancerRR) isValid(spec string) bool { func isValidEndpoint(spec string) bool {
_, port, err := net.SplitHostPort(spec) _, port, err := net.SplitHostPort(spec)
if err != nil { if err != nil {
return false return false
@ -79,10 +79,10 @@ func (lb LoadBalancerRR) isValid(spec string) bool {
return value > 0 return value > 0
} }
func (lb LoadBalancerRR) filterValidEndpoints(endpoints []string) []string { func filterValidEndpoints(endpoints []string) []string {
var result []string var result []string
for _, spec := range endpoints { for _, spec := range endpoints {
if lb.isValid(spec) { if isValidEndpoint(spec) {
result = append(result, spec) result = append(result, spec)
} }
} }
@ -92,14 +92,14 @@ func (lb LoadBalancerRR) filterValidEndpoints(endpoints []string) []string {
// OnUpdate manages the registered service endpoints. // OnUpdate manages the registered service endpoints.
// Registered endpoints are updated if found in the update set or // Registered endpoints are updated if found in the update set or
// unregistered if missing from the update set. // unregistered if missing from the update set.
func (lb LoadBalancerRR) OnUpdate(endpoints []api.Endpoints) { func (lb *LoadBalancerRR) OnUpdate(endpoints []api.Endpoints) {
registeredEndpoints := make(map[string]bool) registeredEndpoints := make(map[string]bool)
lb.lock.Lock() lb.lock.Lock()
defer lb.lock.Unlock() defer lb.lock.Unlock()
// Update endpoints for services. // Update endpoints for services.
for _, endpoint := range endpoints { for _, endpoint := range endpoints {
existingEndpoints, exists := lb.endpointsMap[endpoint.ID] existingEndpoints, exists := lb.endpointsMap[endpoint.ID]
validEndpoints := lb.filterValidEndpoints(endpoint.Endpoints) validEndpoints := filterValidEndpoints(endpoint.Endpoints)
if !exists || !reflect.DeepEqual(existingEndpoints, validEndpoints) { if !exists || !reflect.DeepEqual(existingEndpoints, validEndpoints) {
glog.Infof("LoadBalancerRR: Setting endpoints for %s to %+v", endpoint.ID, endpoint.Endpoints) glog.Infof("LoadBalancerRR: Setting endpoints for %s to %+v", endpoint.ID, endpoint.Endpoints)
lb.endpointsMap[endpoint.ID] = validEndpoints lb.endpointsMap[endpoint.ID] = validEndpoints

16
pkg/proxy/roundrobin_test.go
View File

@ -22,26 +22,24 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
) )
func TestLoadBalanceValidateWorks(t *testing.T) { func TestValidateWorks(t *testing.T) {
loadBalancer := NewLoadBalancerRR() if isValidEndpoint("") {
if loadBalancer.isValid("") {
t.Errorf("Didn't fail for empty string") t.Errorf("Didn't fail for empty string")
} }
if loadBalancer.isValid("foobar") { if isValidEndpoint("foobar") {
t.Errorf("Didn't fail with no port") t.Errorf("Didn't fail with no port")
} }
if loadBalancer.isValid("foobar:-1") { if isValidEndpoint("foobar:-1") {
t.Errorf("Didn't fail with a negative port") t.Errorf("Didn't fail with a negative port")
} }
if !loadBalancer.isValid("foobar:8080") { if !isValidEndpoint("foobar:8080") {
t.Errorf("Failed a valid config.") t.Errorf("Failed a valid config.")
} }
} }
func TestLoadBalanceFilterWorks(t *testing.T) { func TestFilterWorks(t *testing.T) {
loadBalancer := NewLoadBalancerRR()
endpoints := []string{"foobar:1", "foobar:2", "foobar:-1", "foobar:3", "foobar:-2"} endpoints := []string{"foobar:1", "foobar:2", "foobar:-1", "foobar:3", "foobar:-2"}
filtered := loadBalancer.filterValidEndpoints(endpoints) filtered := filterValidEndpoints(endpoints)
if len(filtered) != 3 { if len(filtered) != 3 {
t.Errorf("Failed to filter to the correct size") t.Errorf("Failed to filter to the correct size")