Refactor Orch class to separate recorder implementation (sonic-net#2837)

**What I did** 1) Removed the recorder implementation from the Orch class and added a new Recorder Interface 2) Removed the exposure of recorder related global variables from the CfgMgrs and Orchagent 3) Writing the Kfv tuple to the Rec file was moved from the Orch class into the ConsumerBase 4) Moved the gBatchSize declaration into the Orch and thereby removing the need to explicitly declare the global variable in CfgMgrs **Why I did it** Recorder implementation should not be tied to Orchagent **How I verified it** Install the swss on the switch and verified ``` root@r-lionfish-16:/home/admin# show logging | grep Recorder Jun 23 19:26:15.741815 sonic NOTICE swss#orchagent: :- startRec: SwSS Recorder: Recording started at /var/log/swss/swss.rec Jun 23 19:29:09.514177 sonic INFO swss#orchagent: :- logfileReopen: SwSS Recorder: LogRotate request handled ``` **Verify Logrotate:** ``` root@r-lionfish-16:/home/admin# ls -l /var/log/swss/ total 2752 -rw-r--r-- 1 root root 999877 Jun 23 19:26 sairedis.rec -rw-r--r-- 1 root root 1559947 Jun 23 19:11 sairedis.rec.1 -rw-r--r-- 1 root root 110563 Jun 23 19:27 swss.rec -rw-r--r-- 1 root root 141713 Jun 23 19:16 swss.rec.1 root@r-lionfish-16:/home/admin# logrotate -f /etc/logrotate.conf (Force Logrotate) root@r-lionfish-16:/home/admin# ls -l /var/log/swss/ total 1232 -rw-r--r-- 1 root root 140 Jun 23 19:28 sairedis.rec -rw-r--r-- 1 root root 999877 Jun 23 19:26 sairedis.rec.1 -rw-r--r-- 1 root root 126798 Jun 23 19:11 sairedis.rec.2.gz -rw-r--r-- 1 root root 0 Jun 23 19:28 swss.rec -rw-r--r-- 1 root root 110563 Jun 23 19:27 swss.rec.1 -rw-r--r-- 1 root root 13089 Jun 23 19:16 swss.rec.2.gz <After some time> root@r-lionfish-16:/home/admin# ls -l /var/log/swss/ total 1476 -rw-r--r-- 1 root root 242404 Jun 23 19:29 sairedis.rec -rw-r--r-- 1 root root 999877 Jun 23 19:26 sairedis.rec.1 -rw-r--r-- 1 root root 126798 Jun 23 19:11 sairedis.rec.2.gz -rw-r--r-- 1 root root 1764 Jun 23 19:29 swss.rec -rw-r--r-- 1 root root 110645 Jun 23 19:29 swss.rec.1 -rw-r--r-- 1 root root 13089 Jun 23 19:16 swss.rec.2.gz ```
Pterosaur · Jul 16, 2023 · 5b27c20 · 5b27c20
1 parent c7e1308
commit 5b27c20
Show file tree

Hide file tree

Showing 35 changed files with 306 additions and 477 deletions.
diff --git a/cfgmgr/Makefile.am b/cfgmgr/Makefile.am
@@ -26,67 +26,72 @@ else
 DBGFLAGS = -g
 endif
 
-vlanmgrd_SOURCES = vlanmgrd.cpp vlanmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+COMMON_ORCH_SOURCE = $(top_srcdir)/orchagent/orch.cpp \
+				$(top_srcdir)/orchagent/request_parser.cpp \
+				$(top_srcdir)/orchagent/response_publisher.cpp \
+				$(top_srcdir)/lib/recorder.cpp
+
+vlanmgrd_SOURCES = vlanmgrd.cpp vlanmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 vlanmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 vlanmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 vlanmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-teammgrd_SOURCES = teammgrd.cpp teammgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+teammgrd_SOURCES = teammgrd.cpp teammgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 teammgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 teammgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 teammgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-portmgrd_SOURCES = portmgrd.cpp portmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+portmgrd_SOURCES = portmgrd.cpp portmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 portmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 portmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 portmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-intfmgrd_SOURCES = intfmgrd.cpp intfmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/lib/subintf.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+intfmgrd_SOURCES = intfmgrd.cpp intfmgr.cpp $(top_srcdir)/lib/subintf.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 intfmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 intfmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 intfmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-buffermgrd_SOURCES = buffermgrd.cpp buffermgr.cpp buffermgrdyn.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+buffermgrd_SOURCES = buffermgrd.cpp buffermgr.cpp buffermgrdyn.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 buffermgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 buffermgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 buffermgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-vrfmgrd_SOURCES = vrfmgrd.cpp vrfmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+vrfmgrd_SOURCES = vrfmgrd.cpp vrfmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 vrfmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 vrfmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 vrfmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-nbrmgrd_SOURCES = nbrmgrd.cpp nbrmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+nbrmgrd_SOURCES = nbrmgrd.cpp nbrmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 nbrmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(LIBNL_CFLAGS) $(CFLAGS_ASAN)
 nbrmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(LIBNL_CPPFLAGS) $(CFLAGS_ASAN)
 nbrmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS) $(LIBNL_LIBS)
 
-vxlanmgrd_SOURCES = vxlanmgrd.cpp vxlanmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+vxlanmgrd_SOURCES = vxlanmgrd.cpp vxlanmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 vxlanmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 vxlanmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 vxlanmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-sflowmgrd_SOURCES = sflowmgrd.cpp sflowmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+sflowmgrd_SOURCES = sflowmgrd.cpp sflowmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 sflowmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 sflowmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 sflowmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-natmgrd_SOURCES = natmgrd.cpp natmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+natmgrd_SOURCES = natmgrd.cpp natmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 natmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 natmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 natmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-coppmgrd_SOURCES = coppmgrd.cpp coppmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+coppmgrd_SOURCES = coppmgrd.cpp coppmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 coppmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 coppmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 coppmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-tunnelmgrd_SOURCES = tunnelmgrd.cpp tunnelmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+tunnelmgrd_SOURCES = tunnelmgrd.cpp tunnelmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 tunnelmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 tunnelmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 tunnelmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)
 
-macsecmgrd_SOURCES = macsecmgrd.cpp macsecmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp $(top_srcdir)/orchagent/response_publisher.cpp shellcmd.h
+macsecmgrd_SOURCES = macsecmgrd.cpp macsecmgr.cpp $(COMMON_ORCH_SOURCE) shellcmd.h
 macsecmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 macsecmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI) $(CFLAGS_ASAN)
 macsecmgrd_LDADD = $(LDFLAGS_ASAN) $(COMMON_LIBS) $(SAIMETA_LIBS)

diff --git a/cfgmgr/buffermgrd.cpp b/cfgmgr/buffermgrd.cpp
@@ -21,26 +21,6 @@ using json = nlohmann::json;
 /* SELECT() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
-
 void usage()
 {
     cout << "Usage: buffermgrd <-l pg_lookup.ini|-a asic_table.json [-p peripheral_table.json] [-z zero_profiles.json]>" << endl;

diff --git a/cfgmgr/coppmgrd.cpp b/cfgmgr/coppmgrd.cpp
@@ -16,26 +16,6 @@ using namespace swss;
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
-
 int main(int argc, char **argv)
 {
     Logger::linkToDbNative("coppmgrd");

diff --git a/cfgmgr/intfmgrd.cpp b/cfgmgr/intfmgrd.cpp
@@ -16,26 +16,6 @@ using namespace swss;
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
-
 int main(int argc, char **argv)
 {
     Logger::linkToDbNative("intfmgrd");

diff --git a/cfgmgr/macsecmgrd.cpp b/cfgmgr/macsecmgrd.cpp
@@ -26,26 +26,6 @@ using namespace swss;
 
 MacAddress gMacAddress;
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
-
 static bool received_sigterm = false;
 static struct sigaction old_sigaction;
 

diff --git a/cfgmgr/natmgr.cpp b/cfgmgr/natmgr.cpp
@@ -6129,7 +6129,7 @@ void NatMgr::doStaticNatTask(Consumer &consumer)
         else
         {
             SWSS_LOG_ERROR("Unknown operation type %s", op.c_str());
-            SWSS_LOG_DEBUG("%s", (dumpTuple(consumer, t)).c_str());
+            SWSS_LOG_DEBUG("%s", (consumer.dumpTuple(t)).c_str());
             it = consumer.m_toSync.erase(it);
         }
     }
@@ -6472,7 +6472,7 @@ void NatMgr::doStaticNaptTask(Consumer &consumer)
         else
         {
             SWSS_LOG_ERROR("Unknown operation type %s", op.c_str());
-            SWSS_LOG_DEBUG("%s", (dumpTuple(consumer, t)).c_str());
+            SWSS_LOG_DEBUG("%s", (consumer.dumpTuple(t)).c_str());
             it = consumer.m_toSync.erase(it);
         }
     }
@@ -6859,7 +6859,7 @@ void NatMgr::doNatPoolTask(Consumer &consumer)
         else
         {
             SWSS_LOG_ERROR("Unknown operation type %s", op.c_str());
-            SWSS_LOG_DEBUG("%s", (dumpTuple(consumer, t)).c_str());
+            SWSS_LOG_DEBUG("%s", (consumer.dumpTuple(t)).c_str());
             it = consumer.m_toSync.erase(it);
         }
     }
@@ -7095,7 +7095,7 @@ void NatMgr::doNatBindingTask(Consumer &consumer)
         else
         {
             SWSS_LOG_ERROR("Unknown operation type %s", op.c_str());
-            SWSS_LOG_DEBUG("%s", (dumpTuple(consumer, t)).c_str());
+            SWSS_LOG_DEBUG("%s", (consumer.dumpTuple(t)).c_str());
             it = consumer.m_toSync.erase(it);
         }
     }
@@ -7873,7 +7873,7 @@ void NatMgr::doNatAclTableTask(Consumer &consumer)
         else
         {
             SWSS_LOG_INFO("Unknown operation type %s", op.c_str());
-            SWSS_LOG_DEBUG("%s", (dumpTuple(consumer, t)).c_str());
+            SWSS_LOG_DEBUG("%s", (consumer.dumpTuple(t)).c_str());
             it = consumer.m_toSync.erase(it);
         }
     }
@@ -8137,7 +8137,7 @@ void NatMgr::doNatAclRuleTask(Consumer &consumer)
         else
         {
             SWSS_LOG_INFO("Unknown operation type %s", op.c_str());
-            SWSS_LOG_DEBUG("%s", (dumpTuple(consumer, t)).c_str());
+            SWSS_LOG_DEBUG("%s", (consumer.dumpTuple(t)).c_str());
             it = consumer.m_toSync.erase(it);
         }
     }

diff --git a/cfgmgr/natmgrd.cpp b/cfgmgr/natmgrd.cpp
@@ -39,24 +39,6 @@ using namespace swss;
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int       gBatchSize = 0;
-bool      gSwssRecord = false;
-bool      gLogRotate = false;
-ofstream  gRecordOfs;
-string    gRecordFile;
-bool      gResponsePublisherRecord = false;
-bool      gResponsePublisherLogRotate = false;
-ofstream  gResponsePublisherRecordOfs;
-string    gResponsePublisherRecordFile;
-mutex     gDbMutex;
 NatMgr    *natmgr = NULL;
 
 NotificationConsumer   *timeoutNotificationsConsumer = NULL;

diff --git a/cfgmgr/nbrmgrd.cpp b/cfgmgr/nbrmgrd.cpp
@@ -20,26 +20,6 @@ using namespace swss;
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
-
 int main(int argc, char **argv)
 {
     Logger::linkToDbNative("nbrmgrd");

diff --git a/cfgmgr/portmgrd.cpp b/cfgmgr/portmgrd.cpp
@@ -15,26 +15,6 @@ using namespace swss;
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
-
 int main(int argc, char **argv)
 {
     Logger::linkToDbNative("portmgrd");

diff --git a/cfgmgr/sflowmgrd.cpp b/cfgmgr/sflowmgrd.cpp
@@ -15,26 +15,6 @@ using namespace swss;
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
-
 int main(int argc, char **argv)
 {
     Logger::linkToDbNative("sflowmgrd");

diff --git a/cfgmgr/teammgrd.cpp b/cfgmgr/teammgrd.cpp
@@ -12,16 +12,6 @@ using namespace swss;
 
 #define SELECT_TIMEOUT 1000
 
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-
 bool received_sigterm = false;
 static struct sigaction old_sigaction;
 

diff --git a/cfgmgr/tunnelmgrd.cpp b/cfgmgr/tunnelmgrd.cpp
@@ -19,26 +19,6 @@ using namespace swss;
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
-/*
- * Following global variables are defined here for the purpose of
- * using existing Orch class which is to be refactored soon to
- * eliminate the direct exposure of the global variables.
- *
- * Once Orch class refactoring is done, these global variables
- * should be removed from here.
- */
-int gBatchSize = 0;
-bool gSwssRecord = false;
-bool gLogRotate = false;
-ofstream gRecordOfs;
-string gRecordFile;
-bool gResponsePublisherRecord = false;
-bool gResponsePublisherLogRotate = false;
-ofstream gResponsePublisherRecordOfs;
-string gResponsePublisherRecordFile;
-/* Global database mutex */
-mutex gDbMutex;
-
 int main(int argc, char **argv)
 {
     Logger::linkToDbNative("tunnelmgrd");