diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp index 84e7171c98..e79c8350fc 100644 --- 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 index 86651a7c94..15004b756e 100644 --- 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() {}