[hostcfgd] Configure service auto-restart in hostcfgd.

Before this change, a process runnning inside every SONiC container dealt with FEATURE table 'auto_restart' field and depending on the value decided wether a container has to be killed or not. If killed service auto restart mechanism restarts the container. This change moves the logic from container to the host daemon - hostcfgd. * hostcfgd refactoring - move feature handling in another class. * override systemd service Restart= setting from hostcfgd. * remove code that deals with FEATURE table from supervisor-proc-exit-listener. * remove default systemd Restart=always. Signed-off-by: Stepan Blyshchak <[email protected]>
sonic-net · Oct 26, 2020 · e729226 · e729226
1 parent 5486f87
commit e729226
Show file tree

Hide file tree

Showing 45 changed files with 172 additions and 178 deletions.
diff --git a/dockers/docker-database/supervisord.conf.j2 b/dockers/docker-database/supervisord.conf.j2
@@ -4,7 +4,7 @@ logfile_backups=2
 nodaemon=true
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name database
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-fpm-gobgp/supervisord.conf b/dockers/docker-fpm-gobgp/supervisord.conf
@@ -4,7 +4,7 @@ logfile_backups=2
 nodaemon=true
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-fpm-quagga/supervisord.conf b/dockers/docker-fpm-quagga/supervisord.conf
@@ -4,7 +4,7 @@ logfile_backups=2
 nodaemon=true
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-lldp/supervisord.conf.j2 b/dockers/docker-lldp/supervisord.conf.j2
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name lldp
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-nat/supervisord.conf b/dockers/docker-nat/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name nat
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=100
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name swss
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=100
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name pmon
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=25
 
 [eventlistener:supervisor-proc-exit-script]
-command=/usr/bin/supervisor-proc-exit-listener --container-name radv
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-sflow/supervisord.conf b/dockers/docker-sflow/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name sflow
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-snmp/supervisord.conf b/dockers/docker-snmp/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name snmp
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/dockers/docker-sonic-restapi/supervisord.conf b/dockers/docker-sonic-restapi/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=25
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name restapi
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=false

diff --git a/dockers/docker-sonic-telemetry/supervisord.conf b/dockers/docker-sonic-telemetry/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name telemetry
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=false

diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf
@@ -13,7 +13,7 @@ events=PROCESS_STATE
 buffer_size=50
 
 [eventlistener:supervisor-proc-exit-listener]
-command=/usr/bin/supervisor-proc-exit-listener --container-name teamd
+command=/usr/bin/supervisor-proc-exit-listener
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected

diff --git a/files/build_templates/dhcp_relay.service.j2 b/files/build_templates/dhcp_relay.service.j2
@@ -11,7 +11,6 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{ docker_container_name }}.sh start
 ExecStart=/usr/bin/{{ docker_container_name }}.sh wait
 ExecStop=/usr/bin/{{ docker_container_name }}.sh stop
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/nat.service.j2 b/files/build_templates/nat.service.j2
@@ -11,7 +11,6 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/per_namespace/bgp.service.j2 b/files/build_templates/per_namespace/bgp.service.j2
@@ -14,7 +14,6 @@ ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start{% if multi_instan
 ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
 ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
 
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/per_namespace/database.service.j2 b/files/build_templates/per_namespace/database.service.j2
@@ -17,7 +17,6 @@ User=root
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/per_namespace/lldp.service.j2 b/files/build_templates/per_namespace/lldp.service.j2
@@ -15,7 +15,6 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/per_namespace/swss.service.j2 b/files/build_templates/per_namespace/swss.service.j2
@@ -22,7 +22,6 @@ Environment=sonic_asic_platform={{ sonic_asic_platform }}
 ExecStartPre=/usr/local/bin/swss.sh start{% if multi_instance == 'true' %} %i{% endif %}
 ExecStart=/usr/local/bin/swss.sh wait{% if multi_instance == 'true' %} %i{% endif %}
 ExecStop=/usr/local/bin/swss.sh stop{% if multi_instance == 'true' %} %i{% endif %}
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/per_namespace/teamd.service.j2 b/files/build_templates/per_namespace/teamd.service.j2
@@ -12,7 +12,6 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/pmon.service.j2 b/files/build_templates/pmon.service.j2
@@ -14,7 +14,6 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/radv.service.j2 b/files/build_templates/radv.service.j2
@@ -11,7 +11,6 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/local/bin/{{ docker_container_name }}.sh start
 ExecStart=/usr/local/bin/{{ docker_container_name }}.sh wait
 ExecStop=/usr/local/bin/{{ docker_container_name }}.sh stop
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/restapi.service.j2 b/files/build_templates/restapi.service.j2
@@ -9,7 +9,6 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/sflow.service.j2 b/files/build_templates/sflow.service.j2
@@ -11,7 +11,6 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/share_image/database.service.j2 b/files/build_templates/share_image/database.service.j2
@@ -13,7 +13,6 @@ User=root
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start chassisdb
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait chassisdb
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop chassisdb
-Restart=always
 RestartSec=30
 
 [Install]

diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2
@@ -12,6 +12,5 @@ StartLimitBurst=3
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-Restart=always
 RestartSec=30
 
diff --git a/files/build_templates/telemetry.service.j2 b/files/build_templates/telemetry.service.j2
@@ -11,6 +11,5 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-Restart=always
 RestartSec=30