Enable sairedis counter thread in 3 minutes after SONiC was started (s…

…onic-net#1813) * Enable sairedis counter thread in 3 minutes after SONiC was started * Enable all counters
tiantianlv · Jun 26, 2018 · 6568203 · 6568203
1 parent 4eb866c
commit 6568203
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 8 deletions.
diff --git a/files/build_templates/enable_counters.service b/files/build_templates/enable_counters.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Enable SONiC counters
+
+[Service]
+Type=oneshot
+ExecStart=/bin/bash -c '/usr/bin/counterpoll queue enable ; /usr/bin/counterpoll port enable ; /usr/bin/pfcwd counter_poll enable'
+RemainAfterExit=yes
diff --git a/files/build_templates/enable_counters.timer b/files/build_templates/enable_counters.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Delays the SONiC counters gathering until SONiC has started
+
+[Timer]
+OnBootSec=3min
+Unit=enable_counters.service
+
+[Install]
+WantedBy=timers.target
diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2
@@ -1,12 +1,9 @@
 [Unit]
 Description=SNMP container
-Requires=updategraph.service swss.service
-After=updategraph.service swss.service
+Requires=updategraph.service swss.service enable_counters.service
+After=updategraph.service swss.service enable_counters.service
 
 [Service]
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh attach
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/files/build_templates/snmp.timer b/files/build_templates/snmp.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Delays snmp container until SONiC has started
+
+[Timer]
+OnBootSec=3min 30 sec
+Unit=snmp.service
+
+[Install]
+WantedBy=timers.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -272,6 +272,14 @@ sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /sys || true
 sudo LANG=C chroot $FILESYSTEM_ROOT umount -lf /sys
 {% endif %}
 
+# Copy systemd timer configuration
+# It implements delayed start of services
+sudo cp $BUILD_TEMPLATES/enable_counters.timer $FILESYSTEM_ROOT/etc/systemd/system/
+sudo cp $BUILD_TEMPLATES/enable_counters.service $FILESYSTEM_ROOT/etc/systemd/system/
+sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable enable_counters.timer
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable snmp.timer
+
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get remove -y python-dev 
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get autoremove -y 

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
diff --git a/src/sonic-swss b/src/sonic-swss
diff --git a/src/sonic-utilities b/src/sonic-utilities