unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 324 Wiki Activity

selector: update selector.Select to accept a slice of structs (#1764)

Browse Source
This commit is contained in:
ben-toogood
2020-06-30 15:51:26 +01:00
committed by GitHub
parent 6337c92cd0
commit b882ff3df9
6 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
selector/roundrobin/roundrobin.go
View File

@@ -38,7 +38,7 @@ func (r *roundrobin) Options() selector.Options {
return selector.Options{}
}
func (r *roundrobin) Select(routes []*router.Route) (*router.Route, error) {
func (r *roundrobin) Select(routes []router.Route) (*router.Route, error) {
if len(routes) == 0 {
return nil, selector.ErrNoneAvailable
}
@@ -51,33 +51,27 @@ func (r *roundrobin) Select(routes []*router.Route) (*router.Route, error) {
r.routes[hash] = time.Now()
}
// calculate the route hashes once
hashes := make(map[*router.Route]uint64, len(routes))
for _, s := range routes {
hashes[s] = s.Hash()
}
// if a route hasn't yet been seen, prioritise it
for srv, hash := range hashes {
if _, ok := r.routes[hash]; !ok {
setLastUsed(hash)
return srv, nil
for _, route := range routes {
if _, ok := r.routes[route.Hash()]; !ok {
setLastUsed(route.Hash())
return &route, nil
}
}
// sort the services by the time they were last used
sort.SliceStable(routes, func(i, j int) bool {
iLastSeen := r.routes[hashes[routes[i]]]
jLastSeen := r.routes[hashes[routes[j]]]
iLastSeen := r.routes[routes[i].Hash()]
jLastSeen := r.routes[routes[j].Hash()]
return iLastSeen.UnixNano() < jLastSeen.UnixNano()
})
// return the route which was last used
setLastUsed(hashes[routes[0]])
return routes[0], nil
setLastUsed(routes[0].Hash())
return &routes[0], nil
}
func (r *roundrobin) Record(srv *router.Route, err error) error {
func (r *roundrobin) Record(srv router.Route, err error) error {
return nil
}

30
selector/roundrobin/roundrobin_test.go
View File

@@ -11,39 +11,39 @@ import (
func TestRoundRobin(t *testing.T) {
selector.Tests(t, NewSelector())
r1 := &router.Route{Service: "go.micro.service.foo", Address: "127.0.0.1:8000"}
r2 := &router.Route{Service: "go.micro.service.foo", Address: "127.0.0.1:8001"}
r3 := &router.Route{Service: "go.micro.service.foo", Address: "127.0.0.1:8002"}
r1 := router.Route{Service: "go.micro.service.foo", Address: "127.0.0.1:8000"}
r2 := router.Route{Service: "go.micro.service.foo", Address: "127.0.0.1:8001"}
r3 := router.Route{Service: "go.micro.service.foo", Address: "127.0.0.1:8002"}
sel := NewSelector()
// By passing r1 and r2 first, it forces a set sequence of (r1 => r2 => r3 => r1)
r, err := sel.Select([]*router.Route{r1})
r, err := sel.Select([]router.Route{r1})
assert.Nil(t, err, "Error should be nil")
assert.Equal(t, r1, r, "Expected route to be r1")
assert.Equal(t, r1, *r, "Expected route to be r1")
r, err = sel.Select([]*router.Route{r2})
r, err = sel.Select([]router.Route{r2})
assert.Nil(t, err, "Error should be nil")
assert.Equal(t, r2, r, "Expected route to be r2")
assert.Equal(t, r2, *r, "Expected route to be r2")
// Because r1 and r2 have been recently called, r3 should be chosen
r, err = sel.Select([]*router.Route{r1, r2, r3})
r, err = sel.Select([]router.Route{r1, r2, r3})
assert.Nil(t, err, "Error should be nil")
assert.Equal(t, r3, r, "Expected route to be r3")
assert.Equal(t, r3, *r, "Expected route to be r3")
// r1 was called longest ago, so it should be prioritised
r, err = sel.Select([]*router.Route{r1, r2, r3})
r, err = sel.Select([]router.Route{r1, r2, r3})
assert.Nil(t, err, "Error should be nil")
assert.Equal(t, r1, r, "Expected route to be r1")
assert.Equal(t, r1, *r, "Expected route to be r1")
r, err = sel.Select([]*router.Route{r1, r2, r3})
r, err = sel.Select([]router.Route{r1, r2, r3})
assert.Nil(t, err, "Error should be nil")
assert.Equal(t, r2, r, "Expected route to be r2")
assert.Equal(t, r2, *r, "Expected route to be r2")
r, err = sel.Select([]*router.Route{r1, r2, r3})
r, err = sel.Select([]router.Route{r1, r2, r3})
assert.Nil(t, err, "Error should be nil")
assert.Equal(t, r3, r, "Expected route to be r3")
assert.Equal(t, r3, *r, "Expected route to be r3")
}