Revert "Enable sairedis counter thread in 3 minutes after SONiC was s…

…tarted (sonic-net#1813)" This reverts commit 6568203.
tiantianlv · Jul 30, 2018 · a10c2e6 · a10c2e6
1 parent 2eb0981
commit a10c2e6
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 38 deletions.
diff --git a/files/build_templates/enable_counters.service b/files/build_templates/enable_counters.service
diff --git a/files/build_templates/enable_counters.timer b/files/build_templates/enable_counters.timer
diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2
@@ -1,9 +1,12 @@
 [Unit]
 Description=SNMP container
-Requires=updategraph.service swss.service enable_counters.service
-After=updategraph.service swss.service enable_counters.service
+Requires=updategraph.service swss.service
+After=updategraph.service swss.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
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -272,14 +272,6 @@ 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