Fix broken router stress test

The router stress test was previously assuming that the router had
seen a route if it had a corresponding service unit.  Since endpoints
can result in service units, the fact that all routes were using the
same host was not failing the test. This change ensures that the test
uses unique hosts and properly detects whether a router has seen a route.

Author: marun

pkg/router/template/plugin.go

@@ -60,10 +60,6 @@ type routerInterface interface {
 	// frontend key is used; all call sites make certain the frontend
 	// is created.
 
-	// HasServiceUnit indicates whether the router has a service unit
-	// for the given key.
-	HasServiceUnit(key string) bool
-
 	// CreateServiceUnit creates a new service named with the given id.
 	CreateServiceUnit(id string)
 	// FindServiceUnit finds the service with the given id.
@@ -82,6 +78,8 @@ type routerInterface interface {
 	AddRoute(id string, weight int32, route *routeapi.Route, host string) bool
 	// RemoveRoute removes the given route
 	RemoveRoute(route *routeapi.Route)
+	// HasRoute indicates whether the router is configured with the given route
+	HasRoute(route *routeapi.Route) bool
 	// Reduce the list of routes to only these namespaces
 	FilterNamespaces(namespaces sets.String)
 	// Commit applies the changes in the background. It kicks off a rate-limited

pkg/router/template/plugin_test.go

@@ -206,6 +206,11 @@ func (r *TestRouter) RemoveRoute(route *routeapi.Route) {
 	}
 }
 
+func (r *TestRouter) HasRoute(route *routeapi.Route) bool {
+	// Not used
+	return false
+}
+
 func (r *TestRouter) FilterNamespaces(namespaces sets.String) {
 	if len(namespaces) == 0 {
 		r.State = make(map[string]ServiceAliasConfig)
@@ -246,10 +251,6 @@ func (r *TestRouter) SetSkipCommit(skipCommit bool) {
 func (r *TestRouter) SetSyncedAtLeastOnce() {
 }
 
-func (r *TestRouter) HasServiceUnit(key string) bool {
-	return false
-}
-
 // TestHandleEndpoints test endpoint watch events
 func TestHandleEndpoints(t *testing.T) {
 	testCases := []struct {

pkg/router/template/router.go

@@ -755,12 +755,12 @@ func (r *templateRouter) SetSyncedAtLeastOnce() {
 	glog.V(4).Infof("Router state synchronized for the first time")
 }
 
-// HasServiceUnit attempts to retrieve a service unit for the given
-// key, returning a boolean indication of whether the key is known.
-func (r *templateRouter) HasServiceUnit(key string) bool {
+// HasRoute indicates whether the given route is known to this router.
+func (r *templateRouter) HasRoute(route *routeapi.Route) bool {
 	r.lock.Lock()
 	defer r.lock.Unlock()
-	_, ok := r.findMatchingServiceUnit(key)
+	key := r.routeKey(route)
+	_, ok := r.state[key]
 	return ok
 }
 

test/integration/router_stress_test.go

@@ -78,7 +78,8 @@ func stressRouter(t *testing.T, namespaceCount, routesPerNamespace, routerCount,
 			}
 
 			// Create a route
-			routeProperties := createRouteProperties(service.Name)
+			host := fmt.Sprintf("www-%d-%d.example.com", i, j)
+			routeProperties := createRouteProperties(service.Name, host)
 			route, err := oc.Routes(namespace.Name).Create(routeProperties)
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)
@@ -112,8 +113,7 @@ func stressRouter(t *testing.T, namespaceCount, routesPerNamespace, routerCount,
 		routeCount := 0
 		for _, plugin := range plugins {
 			for _, route := range routes {
-				key := routeKey(route)
-				if plugin.Router.HasServiceUnit(key) {
+				if plugin.Router.HasRoute(route) {
 					routeCount++
 				}
 			}
@@ -132,11 +132,6 @@ func stressRouter(t *testing.T, namespaceCount, routesPerNamespace, routerCount,
 	}
 }
 
-// TODO(marun) reuse a public definition instead of copying.
-func routeKey(route *routeapi.Route) string {
-	return fmt.Sprintf("%s/%s", route.Namespace, route.Spec.To.Name)
-}
-
 func createNamespaceProperties() *kapi.Namespace {
 	return &kapi.Namespace{
 		ObjectMeta: kapi.ObjectMeta{
@@ -176,13 +171,13 @@ func createEndpointsProperties(serviceName string) *kapi.Endpoints {
 	}
 }
 
-func createRouteProperties(serviceName string) *routeapi.Route {
+func createRouteProperties(serviceName, host string) *routeapi.Route {
 	return &routeapi.Route{
 		ObjectMeta: kapi.ObjectMeta{
 			GenerateName: "route-",
 		},
 		Spec: routeapi.RouteSpec{
-			Host: "www.example.com",
+			Host: host,
 			Path: "",
 			To: routeapi.RouteTargetReference{
 				Name: serviceName,