matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make swssconfig status FATAL when it fails (#1009)

Browse Source 
* Make supervisor controlled one-shot program autorestart 0 time, so the status will become FATAL instead of EXITED if failure happens

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>

* Make swssconfig.sh strictly exit on any failure

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>

* Tune startretries, tested in supervisor 3.3.2-1

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
This commit is contained in:
Qi Luo 2017-10-04 01:02:30 -07:00 committed by lguohan
parent 646e836471
commit 554114cfaa
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dockers/docker-orchagent/supervisord.conf
View File

@ -55,7 +55,8 @@ stderr_logfile=syslog
command=/usr/bin/swssconfig.sh command=/usr/bin/swssconfig.sh
priority=7 priority=7
autostart=false autostart=false
autorestart=false autorestart=unexpected
startretries=0
stdout_logfile=syslog stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog

2
dockers/docker-orchagent/swssconfig.sh
View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e
function config_acl { function config_acl {
if [ -f "/etc/sonic/acl.json" ]; then if [ -f "/etc/sonic/acl.json" ]; then
mkdir -p /etc/swss/config.d/acl mkdir -p /etc/swss/config.d/acl