Fix unit tests and other compiler issues

sonic-net · Dec 7, 2020 · d57e6ca · d57e6ca
1 parent 78f86b7
commit d57e6ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp
@@ -553,8 +553,8 @@ bool OrchDaemon::warmRestoreAndSyncUp()
 
         for (Orch *o : m_orchList)
         {
-            if (o == gAclOrch || o == gMirrorOrch) {
-                SWSS_LOG_ERROR("skipping ACL/mirror processing until the end");
+            if (o == gMirrorOrch) {
+                SWSS_LOG_DEBUG("Skipping mirror processing until the end");
                 continue;
             }
 
@@ -563,8 +563,8 @@ bool OrchDaemon::warmRestoreAndSyncUp()
     }
 
     // MirrorOrch depends on everything else being settled before it can run,
-    // and AclOrch depends on MirrorOrch, so we handle these two after the rest
-    // of the data has been processed.
+    // and mirror ACL rules depend on MirrorOrch, so run these two at the end
+    // after the rest of the data has been processed.
     gMirrorOrch->Orch::doTask();
     gAclOrch->Orch::doTask();
 

diff --git a/tests/mock_tests/mock_orchagent_main.cpp b/tests/mock_tests/mock_orchagent_main.cpp
@@ -22,7 +22,6 @@ bool gSaiRedisLogRotate = false;
 ofstream gRecordOfs;
 string gRecordFile;
 
-MirrorOrch *gMirrorOrch;
 VRFOrch *gVrfOrch;
 
 void syncd_apply_view() {}