delete route from child which do not exist

Change-Id: I9ee1df35f332ddf93bae382d7dc50ad3ae855d09

Author: stonewesley

?pkg/clusterhandler/clusterhandler.go

@@ -646,6 +646,14 @@ func (c *clusterHandler) updateRouteToSubtree(msg *clustermessage.ClusterMessage
 			klog.Errorf("add subtree router %s-%s failed: %v", to, msg.Head.ClusterName, err)
 		}
 	}
+	// delete route from child but not in subtrees
+	childsOfChild := clusterrouter.Router().SubTreeOfPort(msg.Head.ClusterName)
+	for _, c := range childsOfChild {
+		if _, ok := subtrees[c]; !ok {
+			clusterrouter.Router().DelRoute(c, msg.Head.ClusterName)
+		}
+	}
+
 	// do not return part of err in for cycle
 	return nil
 }

?pkg/clusterrouter/router.go

@@ -249,8 +249,13 @@ func (cr *ClusterRouter) PortsToSubtreeClusters(clusters *[]string) map[string][
 
 // SubTreeOfPort return a slice of cluster names which is in the subtree under a certain port.
 func (cr *ClusterRouter) SubTreeOfPort(port string) []string {
-	// TODO
-	return nil
+	ret := make([]string, 0)
+	for to, p := range cr.subtreeRouter {
+		if p == port && to != port {
+			ret = append(ret, to)
+		}
+	}
+	return ret
 }
 
 // SubTreeClusters return all cluster names under current cluster.
@@ -313,10 +318,6 @@ func (cr *ClusterRouter) NeighborRouterMessage() *clustermessage.ClusterMessage
 
 // SubTreeMessage wrap subtree router info to cluster message.
 func (cr *ClusterRouter) SubTreeMessage() *clustermessage.ClusterMessage {
-	if len(cr.subtreeRouter) == 0 {
-		return nil
-	}
-
 	cr.rwMutex.RLock()
 	defer cr.rwMutex.RUnlock()
 

?pkg/clusterrouter/router_test.go

@@ -77,6 +77,9 @@ root
 */
 func TestRoute(t *testing.T) {
 	r := Router()
+	// a empty router should has subtree router msg
+	msg := r.SubTreeMessage()
+	assert.NotNil(t, msg)
 
 	err := r.AddRoute("c1", "c1")
 	assert.Nil(t, err)
@@ -112,6 +115,11 @@ func TestRoute(t *testing.T) {
 	err = r.AddRoute("cm", "c1")
 	assert.Nil(t, err)
 
+	assert.ElementsMatch(t,
+		[]string{"cn", "cm"},
+		r.SubTreeOfPort("c1"),
+	)
+
 	assert.EqualValues(t,
 		map[string][]string{
 			"c1": {"cn"},
@@ -123,7 +131,7 @@ func TestRoute(t *testing.T) {
 		[]string{"c1", "c2", "c3", "cn", "cm"},
 		r.SubTreeClusters())
 
-	msg := r.SubTreeMessage()
+	msg = r.SubTreeMessage()
 	assert.NotNil(t, msg)
 	assert.Equal(t, clustermessage.CommandType_SubTreeRoute, msg.Head.Command)
 	serial, err := r.subtreeRouter.Serialize()

?pkg/edgehandler/edgehandler.go

@@ -35,7 +35,7 @@ import (
 )
 
 var (
-	subtreeReportDuration = 1 * time.Minute
+	subtreeReportDuration = 1 * time.Second
 )
 
 // EdgeHandler is edgehandler interface that process messages from tunnel and transmit to shim.