Merge pull request #22094 from alex-mohr/routes

pkg/controller/route/routecontroller.go

@@ -91,28 +91,34 @@ func (rc *RouteController) reconcile(nodes []api.Node, routes []*cloudprovider.R
 			}
 			nameHint := string(node.UID)
 			wg.Add(1)
-			go func(nameHint string, route *cloudprovider.Route) {
+			glog.Infof("Creating route for node %s %s with hint %s", node.Name, route.DestinationCIDR, nameHint)
+			go func(nodeName string, nameHint string, route *cloudprovider.Route, startTime time.Time) {
 				if err := rc.routes.CreateRoute(rc.clusterName, nameHint, route); err != nil {
-					glog.Errorf("Could not create route %s %s: %v", nameHint, route.DestinationCIDR, err)
+					glog.Errorf("Could not create route %s %s for node %s after %v: %v", nameHint, route.DestinationCIDR, nodeName, time.Now().Sub(startTime), err)
+				} else {
+					glog.Infof("Created route for node %s %s with hint %s after %v", nodeName, route.DestinationCIDR, nameHint, time.Now().Sub(startTime))
 				}
 				wg.Done()
-			}(nameHint, route)
+			}(node.Name, nameHint, route, time.Now())
 		}
 		nodeCIDRs[node.Name] = node.Spec.PodCIDR
 	}
-	wg.Wait()
 	for _, route := range routes {
 		if rc.isResponsibleForRoute(route) {
 			// Check if this route applies to a node we know about & has correct CIDR.
 			if nodeCIDRs[route.TargetInstance] != route.DestinationCIDR {
 				wg.Add(1)
 				// Delete the route.
-				go func(route *cloudprovider.Route) {
+				glog.Infof("Deleting route %s %s", route.Name, route.DestinationCIDR)
+				go func(route *cloudprovider.Route, startTime time.Time) {
 					if err := rc.routes.DeleteRoute(rc.clusterName, route); err != nil {
-						glog.Errorf("Could not delete route %s %s: %v", route.Name, route.DestinationCIDR, err)
+						glog.Errorf("Could not delete route %s %s after %v: %v", route.Name, route.DestinationCIDR, time.Now().Sub(startTime), err)
+					} else {
+						glog.Infof("Deleted route %s %s after %v", route.Name, route.DestinationCIDR, time.Now().Sub(startTime))
 					}
 					wg.Done()
-				}(route)
+
+				}(route, time.Now())
 			}
 		}
 	}