[dockers]: Disable autorestart on all supervisor processes inside con…

…tainers (#580)
sonic-net · May 10, 2017 · d5c13c0 · d5c13c0
1 parent 37fc569
commit d5c13c0
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 18 deletions.
diff --git a/dockers/docker-basic_router/supervisord.conf b/dockers/docker-basic_router/supervisord.conf
@@ -7,14 +7,15 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-database/supervisord.conf b/dockers/docker-database/supervisord.conf
@@ -7,6 +7,7 @@ nodaemon=true
 command=/usr/bin/redis-server /etc/redis/redis.conf
 priority=1
 autostart=true
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-dhcp-relay/supervisord.conf b/dockers/docker-dhcp-relay/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:isc-dhcp-relay]
 command=/usr/bin/isc-dhcp-relay.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-fpm-gobgp/supervisord.conf b/dockers/docker-fpm-gobgp/supervisord.conf
@@ -7,28 +7,31 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:gobgpd]
 command=/usr/sbin/gobgpd -p -f /etc/gobgp/gobgpd.conf -r
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:fpmsyncd]
 command=fpmsyncd
 priority=5
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:fpmsyncd]
 command=fpmsyncd
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-lldp-sv2/supervisord.conf b/dockers/docker-lldp-sv2/supervisord.conf
@@ -7,14 +7,15 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
@@ -27,21 +28,23 @@ stderr_logfile=syslog
 command=/usr/sbin/lldpd -d -I Ethernet*,eth*
 priority=100
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:lldpd-conf-reload]
 command=/opt/reconfigure.sh
 priority=150
 autostart=false
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:lldp-syncd]
 command=/usr/bin/env python2 -m lldp_syncd
 priority=200
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:orchagent]
 command=/usr/bin/orchagent.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-platform-monitor/supervisord.conf b/dockers/docker-platform-monitor/supervisord.conf
@@ -7,22 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:lm-sensors]
 command=/usr/bin/lm-sensors.sh
 priority=3
 autostart=false
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-saiserver-brcm/supervisord.conf b/dockers/docker-saiserver-brcm/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:saiserver]
 command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-saiserver-cavm/supervisord.conf b/dockers/docker-saiserver-cavm/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:saiserver]
 command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-saiserver-mlnx/supervisord.conf b/dockers/docker-saiserver-mlnx/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:saiserver]
 command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-snmp-sv2/supervisord.conf b/dockers/docker-snmp-sv2/supervisord.conf
@@ -7,28 +7,31 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:snmpd]
 command=/usr/sbin/snmpd -f -LS4d -u Debian-snmp -g Debian-snmp -I -smux,mteTrigger,mteTriggerConf,ifTable,ifXTable,inetCidrRouteTable,ip -p /run/snmpd.pid
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:snmp-subagent]
 command=/usr/bin/env python3.6 -m sonic_ax_impl
 priority=4
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:teamd]
 command=/usr/bin/teamd.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/platform/broadcom/docker-syncd-brcm/supervisord.conf b/platform/broadcom/docker-syncd-brcm/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:syncd]
 command=/usr/bin/syncd.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
diff --git a/platform/cavium/docker-syncd-cavm/supervisord.conf b/platform/cavium/docker-syncd-cavm/supervisord.conf
@@ -7,21 +7,23 @@ nodaemon=true
 command=/usr/bin/start.sh
 priority=1
 autostart=true
-autorestart=false     ; One-shot
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:rsyslogd]
 command=/usr/sbin/rsyslogd -n
 priority=2
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
 
 [program:syncd]
 command=/usr/bin/syncd.sh
 priority=3
 autostart=false
+autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog