Merge pull request #1124 from milosgajdos83/flush-advert-query

Use the same logic for advertising routes in Router and Network

router/default.go

@@ -88,9 +88,10 @@ func (r *router) Init(opts ...Option) error {
 
 // Options returns router options
 func (r *router) Options() Options {
-	r.Lock()
+	r.RLock()
+	defer r.RUnlock()
+
 	options := r.options
-	r.Unlock()
 
 	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
 func (r *router) flushRouteEvents(evType EventType) ([]*Event, error) {
-	// Do not advertise anything
-	if r.options.Advertise == AdvertiseNone {
-		return []*Event{}, nil
+	// get a list of routes for each service in our routing table
+	// for the configured advertising strategy
+	q := []QueryOption{
+		QueryStrategy(r.options.Advertise),
 	}
 
-	// list all routes
-	routes, err := r.table.List()
-	if err != nil {
-		return nil, fmt.Errorf("failed listing routes: %s", err)
+	routes, err := r.Table().Query(q...)
+	if err != nil && err != ErrRouteNotFound {
+		return nil, err
 	}
 
-	// Return all the routes
-	if r.options.Advertise == AdvertiseAll {
-		// build a list of events to advertise
-		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))
+	log.Debugf("Router advertising %d routes with strategy %s", len(routes), r.options.Advertise)
 
 	// build a list of events to advertise
-	events := make([]*Event, len(bestRoutes))
+	events := make([]*Event, len(routes))
 	var i int
 
-	for _, route := range bestRoutes {
+	for _, route := range routes {
 		event := &Event{
 			Type:      evType,
 			Timestamp: time.Now(),

router/default_test.go

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