Use the same logic for advertising routes in Router and Network

router.Query() allows to query the routes with given router.Strategy.
It uses the same logic as was implemented in flushRoutes but the code
was never updated. This way we are consistent across both router and
network packages.
This commit is contained in:
Milos Gajdos 2020-01-17 16:25:18 +00:00
parent f78e30770e
commit 23d65145e6
No known key found for this signature in database
GPG Key ID: 8B31058CC55DFD4F
2 changed files with 13 additions and 63 deletions

View File

@ -88,9 +88,10 @@ func (r *router) Init(opts ...Option) error {
// Options returns router options // Options returns router options
func (r *router) Options() Options { func (r *router) Options() Options {
r.Lock() r.RLock()
defer r.RUnlock()
options := r.options options := r.options
r.Unlock()
return options return options
} }
@ -733,74 +734,24 @@ func (r *router) Process(a *Advert) error {
// flushRouteEvents returns a slice of events, one per each route in the routing table // flushRouteEvents returns a slice of events, one per each route in the routing table
func (r *router) flushRouteEvents(evType EventType) ([]*Event, error) { func (r *router) flushRouteEvents(evType EventType) ([]*Event, error) {
// Do not advertise anything // get a list of routes for each service in our routing table
if r.options.Advertise == AdvertiseNone { // for the configured advertising strategy
return []*Event{}, nil q := []QueryOption{
QueryStrategy(r.options.Advertise),
} }
// list all routes routes, err := r.Table().Query(q...)
routes, err := r.table.List() if err != nil && err != ErrRouteNotFound {
if err != nil { return nil, err
return nil, fmt.Errorf("failed listing routes: %s", err)
} }
// Return all the routes log.Debugf("Router advertising %d routes with strategy %s", len(routes), r.options.Advertise)
if r.options.Advertise == AdvertiseAll {
// build a list of events to advertise // build a list of events to advertise
events := make([]*Event, len(routes)) events := make([]*Event, len(routes))
for i, route := range routes {
event := &Event{
Type: evType,
Timestamp: time.Now(),
Route: route,
}
events[i] = event
}
return events, nil
}
// routeMap stores the routes we're going to advertise
bestRoutes := make(map[string]Route)
// set whether we're advertising only local
advertiseLocal := r.options.Advertise == AdvertiseLocal
// go through all routes found in the routing table and collapse them to optimal routes
for _, route := range routes {
// if we're only advertising local routes
if advertiseLocal && route.Link != "local" {
continue
}
// now we're going to find the best routes
routeKey := route.Service + "@" + route.Network
current, ok := bestRoutes[routeKey]
if !ok {
bestRoutes[routeKey] = route
continue
}
// if the current optimal route metric is higher than routing table route, replace it
if current.Metric > route.Metric {
bestRoutes[routeKey] = route
continue
}
// if the metrics are the same, prefer advertising your own route
if current.Metric == route.Metric {
if route.Router == r.options.Id {
bestRoutes[routeKey] = route
continue
}
}
}
log.Debugf("Router advertising %d %s routes out of %d", len(bestRoutes), r.options.Advertise, len(routes))
// build a list of events to advertise
events := make([]*Event, len(bestRoutes))
var i int var i int
for _, route := range bestRoutes { for _, route := range routes {
event := &Event{ event := &Event{
Type: evType, Type: evType,
Timestamp: time.Now(), Timestamp: time.Now(),

View File

@ -18,7 +18,6 @@ func routerTestSetup() Router {
func TestRouterStartStop(t *testing.T) { func TestRouterStartStop(t *testing.T) {
r := routerTestSetup() r := routerTestSetup()
log.Debugf("TestRouterStartStop STARTING")
if err := r.Start(); err != nil { if err := r.Start(); err != nil {
t.Errorf("failed to start router: %v", err) t.Errorf("failed to start router: %v", err)
} }