Use more routes and expect the stress test to hit the hard cap

Each router should cap at 10 conflicts. Use more routes to get more
potentially conflicting writes.

Author: smarterclayton

pkg/router/controller/router_controller.go

@@ -234,7 +234,7 @@ func (c *RouterController) Commit() {
 
 // processRoute logs and propagates a route event to the plugin
 func (c *RouterController) processRoute(eventType watch.EventType, route *routeapi.Route) {
-	glog.V(4).Infof("Processing Route: %s/%s -> %s", route.Namespace, route.Name, route.Spec.To.Name)
+	glog.V(4).Infof("Processing route: %s/%s -> %s %s", route.Namespace, route.Name, route.Spec.To.Name, route.UID)
 	glog.V(4).Infof("           Alias: %s", route.Spec.Host)
 	if len(route.Spec.Path) > 0 {
 		glog.V(4).Infof("           Path: %s", route.Spec.Path)

pkg/router/controller/status.go

@@ -313,7 +313,7 @@ type SimpleContentionTracker struct {
 func NewSimpleContentionTracker(interval time.Duration) *SimpleContentionTracker {
 	return &SimpleContentionTracker{
 		expires:        interval,
-		maxContentions: 10,
+		maxContentions: 5,
 
 		ids: make(map[string]trackerElement),
 	}
@@ -397,7 +397,7 @@ func (t *SimpleContentionTracker) IsContended(id string, now time.Time, ingress
 
 	// if the object is contended, exit early
 	if last.state == stateContended {
-		glog.V(4).Infof("Object %s is being written to by another actor", id)
+		glog.V(4).Infof("Object %s is being contended by another writer", id)
 		return true
 	}
 
@@ -408,6 +408,7 @@ func (t *SimpleContentionTracker) IsContended(id string, now time.Time, ingress
 			state: stateContended,
 		}
 		t.contentions++
+		glog.V(4).Infof("Object %s was previously correct and is now incorrect", id)
 		return true
 	}
 

test/extended/router/stress.go

@@ -160,7 +160,7 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 					break Wait
 				}
 			}
-			o.Expect(writes).To(o.BeNumerically("<", 10))
+			o.Expect(writes).To(o.BeNumerically("<=", 10))
 
 			verifyCommandEquivalent(oc.KubeClient(), rs, "md5sum /var/lib/haproxy/conf/*")
 		})
@@ -174,7 +174,8 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 					[]string{
 						"--loglevel=4",
 						fmt.Sprintf("--namespace=%s", ns),
-						"--resync-interval=2m",
+						// the contention tracker is resync / 10, so this will give us 2 minutes of contention tracking
+						"--resync-interval=20m",
 						"--name=conflicting",
 						"--override-hostname",
 						// causes each pod to have a different value
@@ -189,7 +190,7 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 			g.By("creating multiple routes")
 			client := routeclientset.NewForConfigOrDie(oc.AdminConfig()).Route().Routes(ns)
 			var rv string
-			for i := 0; i < 10; i++ {
+			for i := 0; i < 20; i++ {
 				_, err := client.Create(&routev1.Route{
 					ObjectMeta: metav1.ObjectMeta{
 						Name: fmt.Sprintf("%d", i),
@@ -210,7 +211,7 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 				if err != nil {
 					return false, err
 				}
-				o.Expect(routes.Items).To(o.HaveLen(10))
+				o.Expect(routes.Items).To(o.HaveLen(20))
 				other := 0
 				conflicting := 0
 				for _, route := range routes.Items {
@@ -233,7 +234,7 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 				}
 				// if other routers are writing status, wait until we get a complete
 				// set since we don't have a way to tell other routers to ignore us
-				if conflicting < 3 && other%10 != 0 {
+				if conflicting < 3 && other%20 != 0 {
 					return false, nil
 				}
 				outputIngress(routes.Items...)
@@ -248,7 +249,7 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 			o.Expect(err).NotTo(o.HaveOccurred())
 			func() {
 				defer w.Stop()
-				timer := time.NewTimer(10 * time.Second)
+				timer := time.NewTimer(15 * time.Second)
 				ch := w.ResultChan()
 			Wait:
 				for i := 0; ; i++ {
@@ -260,7 +261,8 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
 						break Wait
 					}
 				}
-				o.Expect(writes).To(o.BeNumerically("<", 10))
+				// we expect to see no more than 10 writes per router (we should hit the hard limit)
+				o.Expect(writes).To(o.BeNumerically("<", 30))
 			}()
 
 			// the os_http_be.map file will vary, so only check the haproxy config