-
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
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