Merge remote-tracking branch 'upstream/master' into evpn_fdb_orchagent

sonic-net · Dec 31, 2020 · 1665c71 · 1665c71
2 parents df6b9e7 + 7ba4e43
commit 1665c71
Show file tree

Hide file tree

Showing 7 changed files with 441 additions and 39 deletions.
diff --git a/.artifactignore b/.artifactignore
@@ -0,0 +1,2 @@
+**/*
+!*.deb
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -0,0 +1,193 @@
+# C/C++ with GCC
+# Build your C/C++ project with GCC using make.
+# Add steps that publish test results, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/apps/c-cpp/gcc
+
+trigger:
+  branches:
+    include:
+      - "*"
+
+jobs:
+- job:
+  displayName: "amd64"
+  pool:
+    vmImage: 'ubuntu-20.04'
+
+  container:
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster:latest
+
+  steps:
+  - script: |
+      sudo apt-get install -y libhiredis0.14 libhiredis-dev
+      sudo apt-get install -y libzmq5 libzmq3-dev
+      sudo apt-get install -qq -y \
+          libhiredis-dev \
+          libnl-3-dev \
+          libnl-genl-3-dev \
+          libnl-route-3-dev \
+          libnl-nf-3-dev \
+          swig3.0
+      sudo apt-get install -y libdbus-1-3
+      sudo apt-get install -y libteam-dev \
+          libteam5 \
+          libteamdctl0
+    displayName: "Install dependencies"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 9
+      artifacts: sonic-swss-common
+    displayName: "Download sonic swss common deb packages"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 12
+      artifacts: sonic-sairedis
+    displayName: "Download sonic sairedis deb packages"
+  - script: |
+      sudo dpkg -i sonic-swss-common/libswsscommon_1.0.0_amd64.deb
+      sudo dpkg -i sonic-swss-common/libswsscommon-dev_1.0.0_amd64.deb
+      sudo dpkg -i sonic-sairedis/libsaivs_*.deb
+      sudo dpkg -i sonic-sairedis/libsaivs-dev_*.deb
+      sudo dpkg -i sonic-sairedis/libsairedis_*.deb
+      sudo dpkg -i sonic-sairedis/libsairedis-dev_*.deb
+      sudo dpkg -i sonic-sairedis/libsaimetadata_*.deb
+      sudo dpkg -i sonic-sairedis/libsaimetadata-dev_*.deb
+      sudo dpkg -i sonic-sairedis/syncd-vs_*.deb
+    workingDirectory: $(Pipeline.Workspace)
+    displayName: "Install sonic swss common and sairedis"
+  - checkout: self
+    submodules: true
+  - script: |
+      ./autogen.sh
+      dpkg-buildpackage -us -uc -b -j$(nproc)
+      cp ../*.deb .
+    displayName: "Compile sonic swss"
+  - publish: $(System.DefaultWorkingDirectory)/
+    artifact: sonic-swss
+    displayName: "Archive swss debian packages"
+
+- job:
+  displayName: "arm64"
+  timeoutInMinutes: 180
+  pool: sonic
+
+  container:
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-arm64:latest
+
+  steps:
+  - script: |
+      sudo apt-get install -y libhiredis0.14 libhiredis-dev
+      sudo apt-get install -y libzmq5 libzmq3-dev
+      sudo apt-get install -qq -y \
+          libhiredis-dev \
+          libnl-3-dev \
+          libnl-genl-3-dev \
+          libnl-route-3-dev \
+          libnl-nf-3-dev \
+          swig3.0
+      sudo apt-get install -y libdbus-1-3
+      sudo apt-get install -y libteam-dev \
+          libteam5 \
+          libteamdctl0
+    displayName: "Install dependencies"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 9
+      artifacts: sonic-swss-common.arm64
+    displayName: "Download sonic swss common deb packages"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 12
+      artifacts: sonic-sairedis.arm64
+    displayName: "Download sonic sairedis deb packages"
+  - script: |
+      sudo dpkg -i sonic-swss-common.arm64/libswsscommon_1.0.0_arm64.deb
+      sudo dpkg -i sonic-swss-common.arm64/libswsscommon-dev_1.0.0_arm64.deb
+      sudo dpkg -i sonic-sairedis.arm64/libsaivs_*.deb
+      sudo dpkg -i sonic-sairedis.arm64/libsaivs-dev_*.deb
+      sudo dpkg -i sonic-sairedis.arm64/libsairedis_*.deb
+      sudo dpkg -i sonic-sairedis.arm64/libsairedis-dev_*.deb
+      sudo dpkg -i sonic-sairedis.arm64/libsaimetadata_*.deb
+      sudo dpkg -i sonic-sairedis.arm64/libsaimetadata-dev_*.deb
+      sudo dpkg -i sonic-sairedis.arm64/syncd-vs_*.deb
+    workingDirectory: $(Pipeline.Workspace)
+    displayName: "Install sonic swss common and sairedis"
+  - checkout: self
+    submodules: true
+  - script: |
+      ./autogen.sh
+      dpkg-buildpackage -us -uc -b -j$(nproc)
+      cp ../*.deb .
+    displayName: "Compile sonic swss"
+  - publish: $(System.DefaultWorkingDirectory)/
+    artifact: sonic-swss.arm64
+    displayName: "Archive swss debian packages"
+
+- job:
+  displayName: "armhf"
+  timeoutInMinutes: 180
+  pool: sonic
+
+  container:
+    image: sonicdev-microsoft.azurecr.io:443/sonic-slave-buster-armhf:latest
+
+  steps:
+  - script: |
+      sudo apt-get install -y libhiredis0.14 libhiredis-dev
+      sudo apt-get install -y libzmq5 libzmq3-dev
+      sudo apt-get install -qq -y \
+          libhiredis-dev \
+          libnl-3-dev \
+          libnl-genl-3-dev \
+          libnl-route-3-dev \
+          libnl-nf-3-dev \
+          swig3.0
+      sudo apt-get install -y libdbus-1-3
+      sudo apt-get install -y libteam-dev \
+          libteam5 \
+          libteamdctl0
+    displayName: "Install dependencies"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 9
+      artifacts: sonic-swss-common.armhf
+    displayName: "Download sonic swss common deb packages"
+  - task: DownloadPipelineArtifact@2
+    inputs:
+      source: specific
+      project: build
+      pipeline: 12
+      artifacts: sonic-sairedis.armhf
+    displayName: "Download sonic sairedis deb packages"
+  - script: |
+      sudo dpkg -i sonic-swss-common.armhf/libswsscommon_1.0.0_armhf.deb
+      sudo dpkg -i sonic-swss-common.armhf/libswsscommon-dev_1.0.0_armhf.deb
+      sudo dpkg -i sonic-sairedis.armhf/libsaivs_*.deb
+      sudo dpkg -i sonic-sairedis.armhf/libsaivs-dev_*.deb
+      sudo dpkg -i sonic-sairedis.armhf/libsairedis_*.deb
+      sudo dpkg -i sonic-sairedis.armhf/libsairedis-dev_*.deb
+      sudo dpkg -i sonic-sairedis.armhf/libsaimetadata_*.deb
+      sudo dpkg -i sonic-sairedis.armhf/libsaimetadata-dev_*.deb
+      sudo dpkg -i sonic-sairedis.armhf/syncd-vs_*.deb
+    workingDirectory: $(Pipeline.Workspace)
+    displayName: "Install sonic swss common and sairedis"
+  - checkout: self
+    submodules: true
+  - script: |
+      ./autogen.sh
+      dpkg-buildpackage -us -uc -b -j$(nproc)
+      cp ../*.deb .
+    displayName: "Compile sonic swss"
+  - publish: $(System.DefaultWorkingDirectory)/
+    artifact: sonic-swss.armhf
+    displayName: "Archive swss debian packages"
diff --git a/orchagent/fgnhgorch.cpp b/orchagent/fgnhgorch.cpp
@@ -6,6 +6,7 @@
 #include "swssnet.h"
 #include "crmorch.h"
 #include <array>
+#include <algorithm>
 
 #define LINK_DOWN    0
 #define LINK_UP      1
@@ -20,7 +21,7 @@ extern RouteOrch *gRouteOrch;
 extern CrmOrch *gCrmOrch;
 extern PortsOrch *gPortsOrch;
 
-FgNhgOrch::FgNhgOrch(DBConnector *db, DBConnector *appDb, DBConnector *stateDb, vector<string> &tableNames, NeighOrch *neighOrch, IntfsOrch *intfsOrch, VRFOrch *vrfOrch) :
+FgNhgOrch::FgNhgOrch(DBConnector *db, DBConnector *appDb, DBConnector *stateDb, vector<table_name_with_pri_t> &tableNames, NeighOrch *neighOrch, IntfsOrch *intfsOrch, VRFOrch *vrfOrch) :
         Orch(db, tableNames),
         m_neighOrch(neighOrch),
         m_intfsOrch(intfsOrch),
@@ -105,6 +106,39 @@ void FgNhgOrch::update(SubjectType type, void *cntx)
     }
 }
 
+bool FgNhgOrch::bake()
+{
+    SWSS_LOG_ENTER();
+
+    deque<KeyOpFieldsValuesTuple> entries;
+    vector<string> keys;
+    m_stateWarmRestartRouteTable.getKeys(keys);
+
+    SWSS_LOG_NOTICE("Warm reboot: recovering entry %lu from state", keys.size());
+
+    for (const auto &key : keys)
+    {
+        vector<FieldValueTuple> tuples;
+        m_stateWarmRestartRouteTable.get(key, tuples);
+
+        NextHopIndexMap nhop_index_map(tuples.size(), std::string());
+        for (const auto &tuple : tuples)
+        {
+            const auto index = stoi(fvField(tuple));
+            const auto nextHop = fvValue(tuple);
+
+            nhop_index_map[index] = nextHop;
+            SWSS_LOG_INFO("Storing next hop %s at index %d", nhop_index_map[index].c_str(), index);
+        }
+
+        // Recover nexthop with index relationship
+        m_recoveryMap[key] = nhop_index_map;
+
+        m_stateWarmRestartRouteTable.del(key);
+    }
+
+    return Orch::bake();
+}
 
 /* calculateBankHashBucketStartIndices: generates the hash_bucket_indices for all banks
  * and stores it in fgNhgEntry for the group. 
@@ -191,7 +225,6 @@ void FgNhgOrch::setStateDbRouteEntry(const IpPrefix &ipPrefix, uint32_t index, N
 
 }
 
-
 bool FgNhgOrch::writeHashBucketChange(FGNextHopGroupEntry *syncd_fg_route_entry, uint32_t index, sai_object_id_t nh_oid,
         const IpPrefix &ipPrefix, NextHopKey nextHop)
 {
@@ -881,6 +914,8 @@ bool FgNhgOrch::setNewNhgMembers(FGNextHopGroupEntry &syncd_fg_route_entry, FgNh
     SWSS_LOG_ENTER();
 
     sai_status_t status;
+    bool isWarmReboot = false;
+    auto nexthopsMap = m_recoveryMap.find(ipPrefix.to_string());
     for (uint32_t i = 0; i < fgNhgEntry->hash_bucket_indices.size(); i++) 
     {
         uint32_t bank = i;
@@ -913,11 +948,33 @@ bool FgNhgOrch::setNewNhgMembers(FGNextHopGroupEntry &syncd_fg_route_entry, FgNh
             return false;
         }
 
+        // recover state before warm reboot
+        if (nexthopsMap != m_recoveryMap.end())
+        {
+            isWarmReboot = true;
+        }
+
+        SWSS_LOG_INFO("Warm reboot is set to %d", isWarmReboot);
+
         for (uint32_t j = fgNhgEntry->hash_bucket_indices[i].start_index;
                 j <= fgNhgEntry->hash_bucket_indices[i].end_index; j++)
         {
-            NextHopKey bank_nh_memb = bank_member_changes[bank].nhs_to_add[j % 
-                bank_member_changes[bank].nhs_to_add.size()];
+            NextHopKey bank_nh_memb;
+            if (isWarmReboot)
+            {
+                bank_nh_memb = nexthopsMap->second[j];
+                SWSS_LOG_INFO("Recovering nexthop %s with bucket %d", bank_nh_memb.ip_address.to_string().c_str(), j);
+                // case nhps in bank are all down
+                if (fgNhgEntry->next_hops[bank_nh_memb.ip_address].bank != i)
+                {
+                    syncd_fg_route_entry.inactive_to_active_map[i] = fgNhgEntry->next_hops[bank_nh_memb.ip_address].bank;
+                }
+            }
+            else
+            {
+                bank_nh_memb = bank_member_changes[bank].nhs_to_add[j %
+                    bank_member_changes[bank].nhs_to_add.size()];
+            }
 
             // Create a next hop group member
             sai_attribute_t nhgm_attr;
@@ -961,6 +1018,11 @@ bool FgNhgOrch::setNewNhgMembers(FGNextHopGroupEntry &syncd_fg_route_entry, FgNh
         }
     }
 
+    if (isWarmReboot)
+    {
+        m_recoveryMap.erase(nexthopsMap);
+    }
+
     return true;
 }
 
@@ -1592,7 +1654,7 @@ bool FgNhgOrch::doTaskFgNhgMember(const KeyOpFieldsValuesTuple & t)
             }
             fgNhg_entry->second.next_hops[next_hop] = fg_nh_info;
             SWSS_LOG_INFO("FG_NHG member added for group %s, next-hop %s",
-                    fgNhg_entry->second.fg_nhg_name.c_str(), next_hop.to_string().c_str());
+                    fgNhg_entry->second.fg_nhg_name.c_str(), nhk.to_string().c_str());
         }
     }
     else if (op == DEL_COMMAND)

diff --git a/orchagent/fgnhgorch.h b/orchagent/fgnhgorch.h
@@ -83,18 +83,24 @@ typedef struct
     std::vector<NextHopKey> active_nhs;
 } BankMemberChanges;
 
+typedef std::vector<string> NextHopIndexMap;
+typedef map<string, NextHopIndexMap> WarmBootRecoveryMap;
+
 class FgNhgOrch : public Orch, public Observer
 {
 public:
     FgNhgPrefixes fgNhgPrefixes;
-    FgNhgOrch(DBConnector *db, DBConnector *appDb, DBConnector *stateDb, vector<string> &tableNames, NeighOrch *neighOrch, IntfsOrch *intfsOrch, VRFOrch *vrfOrch);
+    FgNhgOrch(DBConnector *db, DBConnector *appDb, DBConnector *stateDb, vector<table_name_with_pri_t> &tableNames, NeighOrch *neighOrch, IntfsOrch *intfsOrch, VRFOrch *vrfOrch);
 
     void update(SubjectType type, void *cntx);
     bool addRoute(sai_object_id_t, const IpPrefix&, const NextHopGroupKey&);
     bool removeRoute(sai_object_id_t, const IpPrefix&);
     bool validNextHopInNextHopGroup(const NextHopKey&);
     bool invalidNextHopInNextHopGroup(const NextHopKey&);
 
+    // warm reboot support
+    bool bake() override;
+
 private:
     NeighOrch *m_neighOrch;
     IntfsOrch *m_intfsOrch;
@@ -106,6 +112,10 @@ class FgNhgOrch : public Orch, public Observer
     FgPrefixOpCache m_fgPrefixAddCache;
     FgPrefixOpCache m_fgPrefixDelCache;
 
+    // warm reboot support for recovery
+    // < ip_prefix, < HashBuckets, nh_ip>>
+    WarmBootRecoveryMap m_recoveryMap;
+
     bool setNewNhgMembers(FGNextHopGroupEntry &syncd_fg_route_entry, FgNhgEntry *fgNhgEntry,
                     std::vector<BankMemberChanges> &bank_member_changes, 
                     std::map<NextHopKey,sai_object_id_t> &nhopgroup_members_set, const IpPrefix&);

diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp
@@ -127,10 +127,12 @@ bool OrchDaemon::init()
     gIntfsOrch = new IntfsOrch(m_applDb, APP_INTF_TABLE_NAME, vrf_orch);
     gNeighOrch = new NeighOrch(m_applDb, APP_NEIGH_TABLE_NAME, gIntfsOrch, gFdbOrch, gPortsOrch);
 
-    vector<string> fgnhg_tables = {
-        CFG_FG_NHG,
-        CFG_FG_NHG_PREFIX,
-        CFG_FG_NHG_MEMBER
+    const int fgnhgorch_pri = 15;
+
+    vector<table_name_with_pri_t> fgnhg_tables = {
+        { CFG_FG_NHG,                 fgnhgorch_pri },
+        { CFG_FG_NHG_PREFIX,          fgnhgorch_pri },
+        { CFG_FG_NHG_MEMBER,          fgnhgorch_pri }
     };
 
     gFgNhgOrch = new FgNhgOrch(m_configDb, m_applDb, m_stateDb, fgnhg_tables, gNeighOrch, gIntfsOrch, vrf_orch);

diff --git a/tests/mock_tests/aclorch_ut.cpp b/tests/mock_tests/aclorch_ut.cpp
@@ -328,10 +328,12 @@ namespace aclorch_test
             gNeighOrch = new NeighOrch(m_app_db.get(), APP_NEIGH_TABLE_NAME, gIntfsOrch, gFdbOrch, gPortsOrch);
 
             ASSERT_EQ(gFgNhgOrch, nullptr);
-            vector<string> fgnhg_tables = {
-                CFG_FG_NHG,
-                CFG_FG_NHG_PREFIX,
-                CFG_FG_NHG_MEMBER
+            const int fgnhgorch_pri = 15;
+
+            vector<table_name_with_pri_t> fgnhg_tables = {
+                { CFG_FG_NHG,                 fgnhgorch_pri },
+                { CFG_FG_NHG_PREFIX,          fgnhgorch_pri },
+                { CFG_FG_NHG_MEMBER,          fgnhgorch_pri }
             };
             gFgNhgOrch = new FgNhgOrch(m_config_db.get(), m_app_db.get(), m_state_db.get(), fgnhg_tables, gNeighOrch, gIntfsOrch, gVrfOrch);