Store mirror session state in StateDB (sonic-net#609)

* Store mirror state in StateDB * Add MIRROR_SESSION_VLAN_HEADER_VALID * Fix setSessionStatus on MIRROR_SESSION_STATUS * Fix test * (comment) * Fix deactivateSession storing * Add test
lguohan · Sep 7, 2018 · 7114352 · 7114352
1 parent fa2b5d9
commit 7114352
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 85 deletions.
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -961,7 +961,7 @@ bool AclRuleMirror::create()
     bool state = false;
     sai_object_id_t oid = SAI_NULL_OBJECT_ID;
 
-    if (!m_pMirrorOrch->getSessionState(m_sessionName, state))
+    if (!m_pMirrorOrch->getSessionStatus(m_sessionName, state))
     {
         throw runtime_error("Failed to get mirror session state");
     }

diff --git a/orchagent/mirrororch.cpp b/orchagent/mirrororch.cpp
@@ -4,21 +4,26 @@
 #include <utility>
 #include <exception>
 
+#include "sai_serialize.h"
 #include "orch.h"
 #include "logger.h"
 #include "swssnet.h"
 #include "converter.h"
 #include "mirrororch.h"
 
-#define MIRROR_SESSION_STATUS           "status"
-#define MIRROR_SESSION_STATUS_ACTIVE    "active"
-#define MIRROR_SESSION_STATUS_INACTIVE  "inactive"
-#define MIRROR_SESSION_SRC_IP           "src_ip"
-#define MIRROR_SESSION_DST_IP           "dst_ip"
-#define MIRROR_SESSION_GRE_TYPE         "gre_type"
-#define MIRROR_SESSION_DSCP             "dscp"
-#define MIRROR_SESSION_TTL              "ttl"
-#define MIRROR_SESSION_QUEUE            "queue"
+#define MIRROR_SESSION_STATUS               "status"
+#define MIRROR_SESSION_STATUS_ACTIVE        "active"
+#define MIRROR_SESSION_STATUS_INACTIVE      "inactive"
+#define MIRROR_SESSION_SRC_IP               "src_ip"
+#define MIRROR_SESSION_DST_IP               "dst_ip"
+#define MIRROR_SESSION_GRE_TYPE             "gre_type"
+#define MIRROR_SESSION_DSCP                 "dscp"
+#define MIRROR_SESSION_TTL                  "ttl"
+#define MIRROR_SESSION_QUEUE                "queue"
+#define MIRROR_SESSION_DST_MAC_ADDRESS      "dst_mac"
+#define MIRROR_SESSION_MONITOR_PORT         "monitor_port"
+#define MIRROR_SESSION_ROUTE_PREFIX         "route_prefix"
+#define MIRROR_SESSION_VLAN_HEADER_VALID    "vlan_header_valid"
 
 #define MIRROR_SESSION_DEFAULT_VLAN_PRI 0
 #define MIRROR_SESSION_DEFAULT_VLAN_CFI 0
@@ -56,14 +61,14 @@ MirrorEntry::MirrorEntry(const string& platform) :
     nexthopInfo.prefix = IpPrefix("0.0.0.0/0");
 }
 
-MirrorOrch::MirrorOrch(TableConnector appDbConnector, TableConnector confDbConnector,
+MirrorOrch::MirrorOrch(TableConnector stateDbConnector, TableConnector confDbConnector,
         PortsOrch *portOrch, RouteOrch *routeOrch, NeighOrch *neighOrch, FdbOrch *fdbOrch) :
         Orch(confDbConnector.first, confDbConnector.second),
         m_portsOrch(portOrch),
         m_routeOrch(routeOrch),
         m_neighOrch(neighOrch),
         m_fdbOrch(fdbOrch),
-        m_mirrorTableProducer(appDbConnector.first, appDbConnector.second)
+        m_mirrorTable(stateDbConnector.first, stateDbConnector.second)
 {
     m_portsOrch->attach(this);
     m_neighOrch->attach(this);
@@ -121,7 +126,7 @@ bool MirrorOrch::sessionExists(const string& name)
     return m_syncdMirrors.find(name) != m_syncdMirrors.end();
 }
 
-bool MirrorOrch::getSessionState(const string& name, bool& state)
+bool MirrorOrch::getSessionStatus(const string& name, bool& state)
 {
     SWSS_LOG_ENTER();
 
@@ -294,22 +299,45 @@ void MirrorOrch::deleteEntry(const string& name)
     SWSS_LOG_NOTICE("Removed mirror session %s", name.c_str());
 }
 
-bool MirrorOrch::setSessionState(const string& name, MirrorEntry& session)
+void MirrorOrch::setSessionState(const string& name, const MirrorEntry& session, const string& attr)
 {
     SWSS_LOG_ENTER();
 
     SWSS_LOG_INFO("Setting mirroring sessions %s state\n", name.c_str());
 
     vector<FieldValueTuple> fvVector;
+    string value;
+    if (attr.empty() || attr == MIRROR_SESSION_STATUS)
+    {
+        value = session.status ? MIRROR_SESSION_STATUS_ACTIVE : MIRROR_SESSION_STATUS_INACTIVE;
+        fvVector.emplace_back(MIRROR_SESSION_STATUS, value);
+    }
 
-    string status = session.status ? MIRROR_SESSION_STATUS_ACTIVE : MIRROR_SESSION_STATUS_INACTIVE;
+    if (attr.empty() || attr == MIRROR_SESSION_MONITOR_PORT)
+    {
+        value = sai_serialize_object_id(session.neighborInfo.portId);
+        fvVector.emplace_back(MIRROR_SESSION_MONITOR_PORT, value);
+    }
 
-    FieldValueTuple t(MIRROR_SESSION_STATUS, status);
-    fvVector.push_back(t);
+    if (attr.empty() || attr == MIRROR_SESSION_DST_MAC_ADDRESS)
+    {
+        value = session.neighborInfo.mac.to_string();
+        fvVector.emplace_back(MIRROR_SESSION_DST_MAC_ADDRESS, value);
+    }
 
-    m_mirrorTableProducer.set(name, fvVector);
+    if (attr.empty() || attr == MIRROR_SESSION_ROUTE_PREFIX)
+    {
+        value = session.nexthopInfo.prefix.to_string();
+        fvVector.emplace_back(MIRROR_SESSION_ROUTE_PREFIX, value);
+    }
 
-    return true;
+    if (attr.empty() || attr == MIRROR_SESSION_VLAN_HEADER_VALID)
+    {
+        value = to_string(session.neighborInfo.port.m_type == Port::VLAN);
+        fvVector.emplace_back(MIRROR_SESSION_VLAN_HEADER_VALID, value);
+    }
+
+    m_mirrorTable.set(name, fvVector);
 }
 
 bool MirrorOrch::getNeighborInfo(const string& name, MirrorEntry& session)
@@ -533,11 +561,7 @@ bool MirrorOrch::activateSession(const string& name, MirrorEntry& session)
     }
 
     session.status = true;
-
-    if (!setSessionState(name, session))
-    {
-        throw runtime_error("Failed to test session state");
-    }
+    setSessionState(name, session);
 
     MirrorSessionUpdate update = { name, true };
     notify(SUBJECT_TYPE_MIRROR_SESSION_CHANGE, static_cast<void *>(&update));
@@ -566,10 +590,8 @@ bool MirrorOrch::deactivateSession(const string& name, MirrorEntry& session)
 
     session.status = false;
 
-    if (!setSessionState(name, session))
-    {
-        throw runtime_error("Failed to test session state");
-    }
+    // Store whole state into StateDB, since it is far from that frequent it's durable
+    setSessionState(name, session);
 
     SWSS_LOG_NOTICE("Deactive mirror session %s", name.c_str());
 
@@ -597,6 +619,8 @@ bool MirrorOrch::updateSessionDstMac(const string& name, MirrorEntry& session)
     SWSS_LOG_NOTICE("Update mirror session %s destination MAC to %s",
             name.c_str(), session.neighborInfo.mac.to_string().c_str());
 
+    setSessionState(name, session, MIRROR_SESSION_DST_MAC_ADDRESS);
+
     return true;
 }
 
@@ -625,6 +649,7 @@ bool MirrorOrch::updateSessionDstPort(const string& name, MirrorEntry& session)
     SWSS_LOG_NOTICE("Update mirror session %s monitor port to %s",
             name.c_str(), port.m_alias.c_str());
 
+    setSessionState(name, session, MIRROR_SESSION_MONITOR_PORT);
 
     return true;
 }
@@ -682,6 +707,8 @@ bool MirrorOrch::updateSessionType(const string& name, MirrorEntry& session)
     SWSS_LOG_NOTICE("Update mirror session %s VLAN to %s",
             name.c_str(), session.neighborInfo.port.m_alias.c_str());
 
+    setSessionState(name, session, MIRROR_SESSION_VLAN_HEADER_VALID);
+
     return true;
 }
 
@@ -705,6 +732,8 @@ void MirrorOrch::updateNextHop(const NextHopUpdate& update)
 
         session.nexthopInfo.prefix = update.prefix;
 
+        setSessionState(name, session, MIRROR_SESSION_ROUTE_PREFIX);
+
         // This is the ECMP scenario that the new next hop group contains the previous
         // next hop. There is no need to update this session's monitor port.
         if (update.nexthopGroup != IpAddresses() &&

diff --git a/orchagent/mirrororch.h b/orchagent/mirrororch.h
@@ -20,7 +20,7 @@
 /*
  * Contains session data specified by user in config file
  * and data required for MAC address and port resolution
- * */
+ */
 struct MirrorEntry
 {
     bool status;
@@ -69,7 +69,7 @@ class MirrorOrch : public Orch, public Observer, public Subject
 
     void update(SubjectType, void *);
     bool sessionExists(const string&);
-    bool getSessionState(const string&, bool&);
+    bool getSessionStatus(const string&, bool&);
     bool getSessionOid(const string&, sai_object_id_t&);
     bool increaseRefCount(const string&);
     bool decreaseRefCount(const string&);
@@ -80,7 +80,7 @@ class MirrorOrch : public Orch, public Observer, public Subject
     NeighOrch *m_neighOrch;
     FdbOrch *m_fdbOrch;
 
-    Table m_mirrorTableProducer;
+    Table m_mirrorTable;
 
     MirrorTable m_syncdMirrors;
 
@@ -93,7 +93,12 @@ class MirrorOrch : public Orch, public Observer, public Subject
     bool updateSessionDstMac(const string&, MirrorEntry&);
     bool updateSessionDstPort(const string&, MirrorEntry&);
     bool updateSessionType(const string&, MirrorEntry&);
-    bool setSessionState(const string&, MirrorEntry&);
+
+    /*
+     * Store mirror session state in StateDB
+     * attr is the field name will be stored, if empty then all fields will be stored
+     */
+    void setSessionState(const std::string& name, const MirrorEntry& session, const std::string& attr = "");
     bool getNeighborInfo(const string&, MirrorEntry&);
 
     void updateNextHop(const NextHopUpdate&);

diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp
@@ -101,9 +101,9 @@ bool OrchDaemon::init()
     };
     gBufferOrch = new BufferOrch(m_configDb, buffer_tables);
 
-    TableConnector appDbMirrorSession(m_applDb, APP_MIRROR_SESSION_TABLE_NAME);
+    TableConnector stateDbMirrorSession(m_stateDb, APP_MIRROR_SESSION_TABLE_NAME);
     TableConnector confDbMirrorSession(m_configDb, CFG_MIRROR_SESSION_TABLE_NAME);
-    MirrorOrch *mirror_orch = new MirrorOrch(appDbMirrorSession, confDbMirrorSession, gPortsOrch, gRouteOrch, gNeighOrch, gFdbOrch);
+    MirrorOrch *mirror_orch = new MirrorOrch(stateDbMirrorSession, confDbMirrorSession, gPortsOrch, gRouteOrch, gNeighOrch, gFdbOrch);
     VRFOrch *vrf_orch = new VRFOrch(m_configDb, CFG_VRF_TABLE_NAME);
 
     TableConnector confDbAclTable(m_configDb, CFG_ACL_TABLE_NAME);

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -186,6 +186,7 @@ def __init__(self, name=None):
                     network_mode="container:%s" % self.ctn_sw.name,
                     volumes={ self.mount: { 'bind': '/var/run/redis', 'mode': 'rw' } })
 
+        self.appldb = None
         try:
             self.ctn.exec_run("sysctl -w net.ipv6.conf.all.disable_ipv6=0")
             self.check_ready()
@@ -196,7 +197,8 @@ def __init__(self, name=None):
             raise
 
     def destroy(self):
-        del self.appldb
+        if self.appldb:
+            del self.appldb
         if self.cleanup:
             self.ctn.remove(force=True)
             self.ctn_sw.remove(force=True)