From 864a7c60bd9cbd5d6a03dab4e33fb9577787dc08 Mon Sep 17 00:00:00 2001 From: heidinet2007 <43017482+heidinet2007@users.noreply.github.com> Date: Wed, 13 Nov 2019 14:10:11 -0800 Subject: [PATCH] start bgp_eoiu_mark service to populate bgp eoiu marker flags for warm start, if configured so (#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 --- dockers/docker-fpm-frr/start.sh | 7 +++++++ dockers/docker-fpm-frr/supervisord.conf | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/dockers/docker-fpm-frr/start.sh b/dockers/docker-fpm-frr/start.sh index ad9beec766d3..80f9c69ec989 100755 --- a/dockers/docker-fpm-frr/start.sh +++ b/dockers/docker-fpm-frr/start.sh @@ -33,6 +33,13 @@ rm -f /var/run/rsyslogd.pid supervisorctl start rsyslogd +# start eoiu pulling, only if configured so +if [[ $(sonic-cfggen -d -v 'WARM_RESTART.bgp.bgp_eoiu') == 'true' ]]; then + supervisorctl start bgp_eoiu_marker +fi + +supervisorctl start bgpcfgd + # Start Quagga processes supervisorctl start zebra supervisorctl start staticd diff --git a/dockers/docker-fpm-frr/supervisord.conf b/dockers/docker-fpm-frr/supervisord.conf index ba9f38507b80..fe0ce6eda1a4 100644 --- a/dockers/docker-fpm-frr/supervisord.conf +++ b/dockers/docker-fpm-frr/supervisord.conf @@ -75,3 +75,13 @@ autorestart=false startsecs=0 stdout_logfile=syslog stderr_logfile=syslog + +[program:bgp_eoiu_marker] +command=/usr/bin/bgp_eoiu_marker.py +priority=7 +autostart=false +autorestart=false +startsecs=0 +startretries=0 +stdout_logfile=syslog +stderr_logfile=syslog