Merge branch 'master' into state_activated_rq

Author: zjswhhh

.azure-pipelines/test-docker-sonic-vs-template.yml

@@ -44,8 +44,9 @@ jobs:
 - job:
   displayName: vstest
   timeoutInMinutes: ${{ parameters.timeout }}
-  ${{ if parameters.archive_gcov }}:
-    variables:
+  variables:
+    isAsan: ${{ parameters.asan }}
+    ${{ if parameters.archive_gcov }}:
       DIFF_COVER_CHECK_THRESHOLD: 80
       DIFF_COVER_ENABLE: 'true'
       DIFF_COVER_COVERAGE_FILES: Cobertura.xml
@@ -159,6 +160,11 @@ jobs:
     displayName: "Run vs tests"
     continueOnError: ${{ parameters.asan }}
 
+  - script: |
+      echo "##vso[task.setvariable variable=TestsRun]Yes"
+    condition: succeededOrFailed()
+    displayName: 'Record Test Status'
+
   - script: |
       set -ex
       reportgenerator -reporttypes:Cobertura -reports:tests/*coverage.xml -targetdir:.
@@ -179,7 +185,7 @@ jobs:
     inputs:
       testResultsFiles: '**/*_tr.xml'
       testRunTitle: vstest
-    condition: succeeded()
+    condition: and(eq(variables['TestsRun'], 'Yes'), ne(variables['isAsan'], 'true'))
 
   - script: |
       cp -r tests/log $(Build.ArtifactStagingDirectory)/

orchagent/neighorch.cpp

@@ -23,6 +23,7 @@ extern string gMySwitchType;
 extern int32_t gVoqMySwitchId;
 extern BfdOrch *gBfdOrch;
 extern size_t gMaxBulkSize;
+extern string gMyHostName;
 
 const int neighorch_pri = 30;
 
@@ -1839,7 +1840,9 @@ void NeighOrch::doVoqSystemNeighTask(Consumer &consumer)
 
         string alias = key.substr(0, found);
 
-        if(gIntfsOrch->isLocalSystemPortIntf(alias))
+        size_t pos = alias.find('|');
+        std::string port_hostname = (pos != std::string::npos) ? alias.substr(0, pos) : alias;
+        if(gIntfsOrch->isLocalSystemPortIntf(alias) || (gMySwitchType == "voq" && gMyHostName == port_hostname))
         {
             //Synced local neighbor. Skip
             it = consumer.m_toSync.erase(it);

orchagent/portsorch.cpp

@@ -5703,6 +5703,16 @@ void PortsOrch::doLagMemberTask(Consumer &consumer)
         Port lag, port;
         if (!getPort(lag_alias, lag))
         {
+            if (gMySwitchType == "voq")
+            {
+                size_t pos = lag_alias.find('|');
+                std::string port_hostname = (pos != std::string::npos) ? lag_alias.substr(0, pos) : lag_alias;
+                if (gMyHostName == port_hostname)
+                {
+                    it = consumer.m_toSync.erase(it);
+                    continue;
+                }
+            }
             SWSS_LOG_INFO("Failed to locate LAG %s", lag_alias.c_str());
             it++;
             continue;

tests/mock_tests/portsorch_ut.cpp

@@ -3093,6 +3093,60 @@ namespace portsorch_test
         ts.clear();
     }
 
+    /* This test passes an incorrect LAG entry and verifies that this entry is not
+     * erased from the consumer table.
+     */
+    TEST_F(PortsOrchTest, LagMemberCanNotBeLocated)
+    {
+        Table portTable = Table(m_app_db.get(), APP_PORT_TABLE_NAME);
+        Table lagTable = Table(m_app_db.get(), APP_LAG_TABLE_NAME);
+        Table lagMemberTable = Table(m_app_db.get(), APP_LAG_MEMBER_TABLE_NAME);
+
+        // Get SAI default ports to populate DB
+        auto ports = ut_helper::getInitialSaiPorts();
+
+        /*
+         * Next we will prepare some configuration data to be consumed by PortsOrch
+         * 32 Ports, 1 LAG, 1 port is an invalid LAG member.
+         */
+
+        // Populate pot table with SAI ports
+        for (const auto &it : ports)
+        {
+            portTable.set(it.first, it.second);
+        }
+
+        // Set PortConfigDone
+        portTable.set("PortConfigDone", { { "count", to_string(ports.size()) } });
+        portTable.set("PortInitDone", { { } });
+        lagTable.set("PortChannel999",
+            {
+                {"admin_status", "up"},
+                {"mtu", "9100"}
+            }
+        );
+
+        // Add invalid lag member
+        lagMemberTable.set(
+            std::string("InvalidLagMember") + lagMemberTable.getTableNameSeparator() + ports.begin()->first,
+            { {"status", "enabled"} });
+
+        // refill consumer
+        gPortsOrch->addExistingData(&portTable);
+        gPortsOrch->addExistingData(&lagTable);
+        gPortsOrch->addExistingData(&lagMemberTable);
+
+        static_cast<Orch *>(gPortsOrch)->doTask();
+
+        // verify there is a pending task to do.
+        vector<string> ts;
+        auto exec = gPortsOrch->getExecutor(APP_LAG_MEMBER_TABLE_NAME);
+        auto consumer = static_cast<Consumer*>(exec);
+        ts.clear();
+        consumer->dumpPendingTasks(ts);
+        ASSERT_FALSE(ts.empty());
+    }
+
     /* This test checks that a LAG member validation happens on orchagent level
      * and no SAI call is executed in case a port requested to be a LAG member
      * is already a LAG member.