From 109b0bc7af421f7fdaa4534f2c6a6470ead2c498 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Mon, 1 May 2017 18:51:13 +0000
Subject: [PATCH] Temporarily disable Acl thread to collect counters

---
 orchagent/aclorch.cpp | 2 --
 orchagent/aclorch.h   | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
index a35007c507..7727fc02b5 100644
--- 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
index a005a7ec0a..67d7735fad 100644
--- 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);