To decrease the Connect Retry Timer from default value which is 120se…

…c to 10 sec. (sonic-net#7087) Why I did it It was observed that on a multi-asic DUT bootup, the BGP internal sessions between ASIC's was taking more time to get ESTABLISHED than external BGP sessions. The internal sessions was coming up almost exactly 120 secs later. In multi-asic platform the bgp dockers ( which is per ASIC ) on switch start are bring brought up around the same time and they try to make the bgp sessions with neighbors (in peer ASIC's) which may be not be completely up. This results in BGP connect fail and the retry happens after 120sec which is the default Connect Retry Timer How I did it Add the command to set the bgp neighboring session retry timer to 10sec for internal bgp neighbors.
raphaelt-nvidia · May 13, 2021 · c28756e · c28756e
1 parent 063f826
commit c28756e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/templates/internal/instance.conf.j2
@@ -4,6 +4,7 @@
   neighbor {{ neighbor_addr }} remote-as {{ bgp_session['asn'] }}
   neighbor {{ neighbor_addr }} description {{ bgp_session['name'] }}
   neighbor {{ neighbor_addr }} timers 3 10
+  neighbor {{ neighbor_addr }} timers connect 10
 !
 {% if neighbor_addr | ipv4 %}
   address-family ipv4

diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v4.conf
@@ -4,6 +4,7 @@
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
   neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group INTERNAL_PEER_V4
     neighbor 10.10.10.10 next-hop-self force

diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_back_v6.conf
@@ -4,6 +4,7 @@
   neighbor fc::10 remote-as 555
   neighbor fc::10 description remote_peer
   neighbor fc::10 timers 3 10
+  neighbor fc::10 timers connect 10
   address-family ipv6
     neighbor fc::10 peer-group INTERNAL_PEER_V6
     neighbor fc::10 next-hop-self force

diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v4.conf
@@ -4,6 +4,7 @@
   neighbor 10.10.10.10 remote-as 555
   neighbor 10.10.10.10 description remote_peer
   neighbor 10.10.10.10 timers 3 10
+  neighbor 10.10.10.10 timers connect 10
   address-family ipv4
     neighbor 10.10.10.10 peer-group INTERNAL_PEER_V4
     neighbor 10.10.10.10 activate

diff --git a/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf b/src/sonic-bgpcfgd/tests/data/internal/instance.conf/result_front_v6.conf
@@ -4,6 +4,7 @@
   neighbor fc::10 remote-as 555
   neighbor fc::10 description remote_peer
   neighbor fc::10 timers 3 10
+  neighbor fc::10 timers connect 10
   address-family ipv6
     neighbor fc::10 peer-group INTERNAL_PEER_V6
     neighbor fc::10 activate