[aclorch]: Temporarily disable ACL thread of collecting counters (#202)

This commit is to mitigate the issue #201.
sonic-net · May 1, 2017 · 2f594c7 · 2f594c7
1 parent beff20b
commit 2f594c7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -794,7 +794,6 @@ bool AclRange::remove()
 
 AclOrch::AclOrch(DBConnector *db, vector<string> tableNames, PortsOrch *portOrch, MirrorOrch *mirrorOrch) :
         Orch(db, tableNames),
-        thread(AclOrch::collectCountersThread, this),
         m_portOrch(portOrch),
         m_mirrorOrch(mirrorOrch)
 {
@@ -826,7 +825,6 @@ AclOrch::~AclOrch()
 
     m_bCollectCounters = false;
     m_sleepGuard.notify_all();
-    join();
 }
 
 void AclOrch::update(SubjectType type, void *cntx)

diff --git a/orchagent/aclorch.h b/orchagent/aclorch.h
@@ -3,7 +3,6 @@
 
 #include <iostream>
 #include <sstream>
-#include <thread>
 #include <mutex>
 #include <tuple>
 #include <condition_variable>
@@ -228,7 +227,7 @@ inline void split(string str, Iterable& out, char delim = ' ')
     }
 }
 
-class AclOrch : public Orch, public Observer, public thread
+class AclOrch : public Orch, public Observer
 {
 public:
     AclOrch(DBConnector *db, vector<string> tableNames, PortsOrch *portOrch, MirrorOrch *mirrorOrch);