Skip to content

Commit 7598604

Browse files
stepanblyschakmssonicbld
authored andcommitted
Revert suppress FIB pending feature (#19027)
Why I did it Revert BGP suppress FIB pending due to unresolved FRR issues in current version Work item tracking Microsoft ADO (number only): How I did it Revert it How to verify it Build and run
1 parent 9c7bb80 commit 7598604

34 files changed

+4
-89
lines changed

dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
7070
!
7171
{% block bgp_init %}
7272
bgp log-neighbor-changes
73-
bgp suppress-fib-pending
7473
no bgp default ipv4-unicast
7574
no bgp ebgp-requires-policy
7675
{% if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'].lower() == 'dualtor') %}

dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ stderr_logfile=syslog
3030
dependent_startup=true
3131

3232
[program:zebra]
33-
command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp --asic-offload=notify_on_offload
33+
command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl -M snmp
3434
priority=4
3535
autostart=false
3636
autorestart=false

platform/vs/docker-sonic-vs/supervisord.conf.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ environment=ASAN_OPTIONS="log_path=/var/log/asan/teammgrd-asan.log{{ asan_extra_
164164
{% endif %}
165165

166166
[program:zebra]
167-
command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl --asic-offload=notify_on_offload
167+
command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_nl
168168
priority=13
169169
autostart=false
170170
autorestart=false

src/sonic-bgpcfgd/bgpcfgd/managers_bgp.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,11 +311,10 @@ def apply_op(self, cmd, vrf):
311311
:return: True if no errors, False if there are errors
312312
"""
313313
bgp_asn = self.directory.get_slot("CONFIG_DB", swsscommon.CFG_DEVICE_METADATA_TABLE_NAME)["localhost"]["bgp_asn"]
314-
enable_bgp_suppress_fib_pending_cmd = 'bgp suppress-fib-pending'
315314
if vrf == 'default':
316-
cmd = ('router bgp %s\n %s\n' % (bgp_asn, enable_bgp_suppress_fib_pending_cmd)) + cmd
315+
cmd = ('router bgp %s\n' % bgp_asn) + cmd
317316
else:
318-
cmd = ('router bgp %s vrf %s\n %s\n' % (bgp_asn, vrf, enable_bgp_suppress_fib_pending_cmd)) + cmd
317+
cmd = ('router bgp %s vrf %s\n' % (bgp_asn, vrf)) + cmd
319318
self.cfg_mgr.push(cmd)
320319
return True
321320

src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ route-map HIDE_INTERNAL permit 20
5555
router bgp 55555
5656
!
5757
bgp log-neighbor-changes
58-
bgp suppress-fib-pending
5958
no bgp default ipv4-unicast
6059
no bgp ebgp-requires-policy
6160
!

src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ route-map HIDE_INTERNAL permit 10
3434
router bgp 55555
3535
!
3636
bgp log-neighbor-changes
37-
bgp suppress-fib-pending
3837
no bgp default ipv4-unicast
3938
no bgp ebgp-requires-policy
4039
!

src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/base.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ ip prefix-list PL_LoopbackV4 permit 55.55.55.55/32
1212
router bgp 55555
1313
!
1414
bgp log-neighbor-changes
15-
bgp suppress-fib-pending
1615
no bgp default ipv4-unicast
1716
no bgp ebgp-requires-policy
1817
!

src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ route-map HIDE_INTERNAL permit 10
3434
router bgp 55555
3535
!
3636
bgp log-neighbor-changes
37-
bgp suppress-fib-pending
3837
no bgp default ipv4-unicast
3938
no bgp ebgp-requires-policy
4039
!

src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults_router_id.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ route-map HIDE_INTERNAL permit 10
3434
router bgp 55555
3535
!
3636
bgp log-neighbor-changes
37-
bgp suppress-fib-pending
3837
no bgp default ipv4-unicast
3938
no bgp ebgp-requires-policy
4039
!

src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/ipv6_lo.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ ipv6 prefix-list PL_LoopbackV6 permit fc00::1/128
1414
router bgp 55555
1515
!
1616
bgp log-neighbor-changes
17-
bgp suppress-fib-pending
1817
no bgp default ipv4-unicast
1918
no bgp ebgp-requires-policy
2019
!

0 commit comments

Comments
 (0)