Merge pull request #254 from bio-routing/fix/dedup_mem

Make BGP path dedup optional. Set init cache size = 0.
bio-routing · Apr 15, 2020 · 27fb65a · 27fb65a
2 parents 3538060 + 64cc1c4
commit 27fb65a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/cmd/bio-rdc/main.go b/cmd/bio-rdc/main.go
@@ -106,7 +106,7 @@ func showRouteReceiveBGP(parts []string) {
 			return
 		}
 
-		rr := route.RouteFromProtoRoute(r)
+		rr := route.RouteFromProtoRoute(r, false)
 		fmt.Println(rr.Print())
 	}
 

diff --git a/cmd/riscli/route.go b/cmd/riscli/route.go
@@ -8,6 +8,6 @@ import (
 )
 
 func printRoute(ar *api.Route) {
-	r := route.RouteFromProtoRoute(ar)
+	r := route.RouteFromProtoRoute(ar, false)
 	fmt.Println(r.Print())
 }
diff --git a/net/ip_cache.go b/net/ip_cache.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	ipCachePreAlloc = 1500000
+	ipCachePreAlloc = 0
 )
 
 var (

diff --git a/net/prefix_cache.go b/net/prefix_cache.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	prefixCachePreAlloc = 1500000
+	prefixCachePreAlloc = 0
 )
 
 var (

diff --git a/route/bgp_path.go b/route/bgp_path.go
@@ -108,7 +108,7 @@ func (b *BGPPath) ToProto() *api.BGPPath {
 }
 
 // BGPPathFromProtoBGPPath converts a proto BGPPath to BGPPath
-func BGPPathFromProtoBGPPath(pb *api.BGPPath) *BGPPath {
+func BGPPathFromProtoBGPPath(pb *api.BGPPath, dedup bool) *BGPPath {
 	p := &BGPPath{
 		BGPPathA: &BGPPathA{
 			NextHop:       bnet.IPFromProtoIP(*pb.NextHop),
@@ -124,7 +124,9 @@ func BGPPathFromProtoBGPPath(pb *api.BGPPath) *BGPPath {
 		ASPath:         types.ASPathFromProtoASPath(pb.AsPath),
 	}
 
-	p = p.Dedup()
+	if dedup {
+		p = p.Dedup()
+	}
 
 	communities := make(types.Communities, len(pb.Communities))
 	p.Communities = &communities

diff --git a/route/bgp_path_test.go b/route/bgp_path_test.go
@@ -100,7 +100,7 @@ func TestBGPPathFromProtoBGPPath(t *testing.T) {
 		ClusterList: &types.ClusterList{999, 199},
 	}
 
-	result := BGPPathFromProtoBGPPath(input)
+	result := BGPPathFromProtoBGPPath(input, false)
 	assert.Equal(t, expected, result)
 }
 

diff --git a/route/route.go b/route/route.go
@@ -267,7 +267,7 @@ func (r *Route) ToProto() *api.Route {
 }
 
 // RouteFromProtoRoute converts a proto Route to a Route
-func RouteFromProtoRoute(ar *api.Route) *Route {
+func RouteFromProtoRoute(ar *api.Route, dedup bool) *Route {
 	r := &Route{
 		pfx:   net.NewPrefixFromProtoPrefix(*ar.Pfx),
 		paths: make([]*Path, 0, len(ar.Paths)),
@@ -278,7 +278,7 @@ func RouteFromProtoRoute(ar *api.Route) *Route {
 		switch ar.Paths[i].Type {
 		case api.Path_BGP:
 			p.Type = BGPPathType
-			p.BGPPath = BGPPathFromProtoBGPPath(ar.Paths[i].BgpPath)
+			p.BGPPath = BGPPathFromProtoBGPPath(ar.Paths[i].BgpPath, dedup)
 		}
 
 		r.paths = append(r.paths, p)