-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
start bgp_eoiu_mark service to populate bgp eoiu marker flags for warm start, if configured so #3489
Conversation
dockers/docker-fpm-frr/start.sh
Outdated
@@ -31,6 +31,11 @@ rm -f /var/run/rsyslogd.pid | |||
|
|||
supervisorctl start rsyslogd | |||
|
|||
# start eoiu pulling, only if configured so | |||
if [ $(sonic-cfggen -d --print-data | grep 'bgp_eoiu' | grep -c 'true') -ge 1 ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sonic-cfggen -d -v bgp_eoiu
could work better here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi Pavel, thanks for your review. However, "sonic-cfggen -d -v" doesn't seem to do the desired check:
admin@ASW-7004:$ sonic-cfggen -d --print-data | grep 'bgp_eoiu' "bgp_eoiu": "true", <------- show the config admin@ASW-7004:$ sonic-cfggen -d -v bgp_eoiu <------- show nothing admin@ASW-7004:$ sonic-cfggen -d -v 'WARM_RESTART' {'bgp': {'bgp_eoiu': 'true', 'bgp_timer': '120'}} admin@ASW-7004:$
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Try
sonic-cfggen -d -v 'WARM_RESTART.bgp.bgp_eoiu'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just updated the diff. Please review it. thanks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if [ $(sonic-cfggen -d -v 'WARM_RESTART.bgp.bgp_eoiu' | grep -c 'true')
to
if [ $(sonic-cfggen -d -v 'WARM_RESTART.bgp.bgp_eoiu') = 'true' ];
or
if [[ $(sonic-cfggen -d -v 'WARM_RESTART.bgp.bgp_eoiu') == 'true' ]];
supervisorctl start bgp_eoiu_marker | ||
fi | ||
|
||
supervisorctl start bgpcfgd |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this is added accidently? It was moved to end as part of #3627
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…m start, if configured so (sonic-net#3489) * start bgp_eoiu_mark service to populate bgp eoiu marker if configured so * Address code review comments: check db value via "-v" option in sonic-cfggen * Address code review comment 2: check string against 'true' directly, instead of couting * Update start.sh
…atically (#20188) #### Why I did it src/sonic-utilities ``` * 3a0575c2 - (HEAD -> 202405, origin/202405) Add back the option f to the reboot script (#3492) (4 hours ago) [DavidZagury] * 60c14df8 - Enable show interfacess counters on chassis supervisor (#3488) (4 hours ago) [Changrong Wu] * cbbfe7b7 - [chassis][cli] Fix config chassis module startup/shutdown command for fabric module (#3483) (4 hours ago) [Marty Y. Lok] * b6cbe6ed - Remove redundant mmuconfig file (#3446) (4 hours ago) [HP] * fb6dd589 - [qos reload] Fix "config qos reload" overriding entire CONFIG_DB (#3479) (4 hours ago) [Stepan Blyshchak] * 9da5db58 - Skip default lanes dup check (#3489) (4 hours ago) [Xincun Li] * edde02ce - [Mellanox] Add CMIS Host Management Files to 'show techsupport' Dumps (#3501) (4 hours ago) [Tomer Shalvi] ``` #### How I did it #### How to verify it #### Description for the changelog
…atically (#20573) #### Why I did it src/sonic-utilities ``` * 32e6de7f - (HEAD -> master, origin/master, origin/HEAD) Update DB migrator script to next branch 202505 (#3664) (3 days ago) [Kumaresh Perumal] * 8d00aba7 - (origin/test_202411_20, origin/test_202411_100, origin/kperumal_202411, origin/202411) Fix save_file command in generate_dump (#3647) (4 days ago) [DavidZagury] * 038aaa5f - Revert "Speed up route_check script" (#3653) (4 days ago) [xwjiang-ms] * 032a0e03 - [config]Restrict YANG validation to Golden Config (#3656) (4 days ago) [jingwenxie] * 47b79bea - Update gcu_field_operation_validators.conf.json with Arista-7260CX3-D108C10 (#3650) (4 days ago) [Dev Ojha] * 845f46ef - Update PR checker pipeline to point to bookworm (#3651) (4 days ago) [bingwang-ms] * 28e645f4 - [show_tech] Filter out a list of commands in generate_dump script which are not applicable to Supervisor (#3646) (5 days ago) [Marty Y. Lok] * b767cb86 - [cisco|express-boot]: Add support for cisco express boot in sonic-utilities (#3056) (6 days ago) [jhli-cisco] * f6b9912c - Fix show command column change issue (#3645) (8 days ago) [Feng-msft] * 9cd6c8de - Debug dump utility dash objects update (#3387) (8 days ago) [Gagan Punathil Ellath] * f705c456 - Validate interface name length in CLI (#3580) (8 days ago) [Stepan Blyshchak] * 3d78cb16 - [Mellanox] Update the save_file command in generate_dump to handle folders (#3631) (13 days ago) [DavidZagury] * 5086a43b - Fix counterpoll show for ENI Counters (#3618) (13 days ago) [Vivek] * 70f81397 - Extra delay between running firmware and updating firmware version (#3610) (2 weeks ago) [Stephen Sun] * 636f7f1d - Add port FEC BER show changes (#3607) (2 weeks ago) [vincentpcng] * 5e60031b - Supports FRR-VRRP configuration (#2949) (3 weeks ago) [Philo] * 9bd37dc6 - [ARM64][Warm-Reboot]: Get boot arguments from uboot environment (#3613) (3 weeks ago) [Parthiv Shah] * 171b16c2 - platform/innovium renaming to platform/marvell-teralynx (#3474) (3 weeks ago) [krismarvell] * 2cbfcc91 - [Mellanox] Add Mellanox-SN5600-C224O8 to gcu_field.json (#3612) (4 weeks ago) [noaOrMlnx] * a8f7bde0 - PVST Feature commit (#3567) (4 weeks ago) [Divya Kumaran Chandralekha] * 0e188076 - Refresh dump file modify timestamp before cleanup call (#3595) (4 weeks ago) [anamehra] * 8f3c5ef5 - [warm-reboot] Add support to pass extra kernel cmdline parameters (#3192) (4 weeks ago) [Pavan Naregundi] * 96774477 - Run yang validation in db migrator (#3102) (4 weeks ago) [ganglv] * 9708f52b - [Mellanox] Update C256X1 SKU to be C256S1 in gcu_field.json (#3611) (4 weeks ago) [noaOrMlnx] * 093ed4aa - [SPM] Add logic to disable the feature before stopping it and enabling it before starting (#3344) (4 weeks ago) [Vadym Hlushko] * 7d013dff - Fix slash in path. (#3573) (5 weeks ago) [Xincun Li] * 0af4386e - Consolidate the get running config way. (#3585) (5 weeks ago) [Xincun Li] * 964b4895 - Fix for integer overflow of counter value if its too large (#3596) (5 weeks ago) [harjotsinghpawra] * 3354d08a - [config] Bypass standard input for reload (#3597) (5 weeks ago) [jingwenxie] * 7cbcfda5 - Speed up route_check script (#3544) (5 weeks ago) [Deepak Singhal] * 329fc223 - Add support of the pensando-dpu platform to generate-dump utility. (#3557) (6 weeks ago) [BHUKYA SIDDHU] * 0ae2ec1e - Add CLI for bmp configdb entity Enable/Disable (#3286) (6 weeks ago) [Feng-msft] * 5b37ee6c - Vnet_route_check TCP socket for DB connection. (#3578) (6 weeks ago) [siqbal1986] * d64a90a0 - Adds logic to get default disk and check disk type (#3399) (6 weeks ago) [Ashwin Srinivasan] * b2b97340 - [Banner] Added CLI commands to configure Banner and display current configuration (#3021) (6 weeks ago) [Sviatoslav Boichuk] * d0aa94a1 - Revert "Record and warn tables which not covered by YANG (#3583)" (#3588) (7 weeks ago) [jingwenxie] * aeda86a1 - Record and warn tables which not covered by YANG (#3583) (7 weeks ago) [jingwenxie] * dd34d7c4 - Revert "Skip default lanes dup check (#3489)" (#3572) (7 weeks ago) [Xincun Li] * 6c8007fa - [Mellanox]Remove deprecated sdk sniffer cli and collect sdk dump in show techsupport (#3491) (7 weeks ago) [Yuanzhe] * 89bb87ad - Add YANG validation for config reload if file is given (#3576) (7 weeks ago) [jingwenxie] ``` #### How I did it #### How to verify it #### Description for the changelog
This is to address review comments for
#2823
Other related PR:
sonic-net/sonic-utilities#655
#2823
sonic-net/sonic-swss-common#273
sonic-net/sonic-swss#856