Fix Warmboot Issue when upgraded Image SAI return Switch Internal OID…

… not accounted in previous image. (sonic-net#654) * Fix the issue sonic-net#5274 Basically Switch Internal OID should always be accounted in Temp and Current Logic Comparison. It should never trigger remove operation. Changes is to always add Switch Internal OID to COLDVIDS (even in case of warm-boot) Signed-off-by: Abhishek Dosi <[email protected]> * Fix the API that check NonRemovableOID to check internal OID first before Cold Bott Discover OID. Also address review Comments. * Address Review Comments Signed-off-by: Abhishek Dosi <[email protected]>
Metaswitch · Sep 2, 2020 · caa7ab2 · caa7ab2
1 parent 9c80626
commit caa7ab2
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 10 deletions.
diff --git a/syncd/SaiSwitch.cpp b/syncd/SaiSwitch.cpp
@@ -517,7 +517,7 @@ sai_object_id_t SaiSwitch::helperGetSwitchAttrOid(
          * Redis value of this attribute is not present yet, save it!
          */
 
-        redisSetDummyAsicStateForRealObjectId(rid);
+        redisSaveInternalOids(rid);
 
         SWSS_LOG_INFO("redis %s id is not defined yet in redis", meta->attridname);
 
@@ -611,25 +611,29 @@ bool SaiSwitch::isNonRemovableRid(
         SWSS_LOG_THROW("NULL rid passed");
     }
 
-    if (!isColdBootDiscoveredRid(rid))
-    {
-        /*
-         * This object was not discovered on cold boot so it can be removed.
-         */
-
-        return false;
-    }
-
     /*
      * Check for SAI_SWITCH_ATTR_DEFAULT_* oids like cpu, default virtual
      * router.  Those objects can't be removed if user ask for it.
      */
 
+    /* Here we are checking for isSwitchObjectDefaultRid first then ColdBootDiscoveredRid
+     * as it is possible we can discover switch Internal OID as part of warm-booot also especially
+     * when we are doing SAI upgrade as part of warm-boot.*/
+
     if (isSwitchObjectDefaultRid(rid))
     {
         return true;
     }
 
+    if (!isColdBootDiscoveredRid(rid))
+    {
+        /*
+         * This object was not discovered on cold boot so it can be removed.
+         */
+
+        return false;
+    }
+
     sai_object_type_t ot = m_vendorSai->objectTypeQuery(rid);
 
     /*
@@ -744,6 +748,35 @@ std::set<sai_object_id_t> SaiSwitch::getWarmBootDiscoveredVids() const
     return m_warmBootDiscoveredVids;
 }
 
+void SaiSwitch::redisSaveInternalOids(
+                                      _In_ sai_object_id_t rid) const
+{
+    SWSS_LOG_ENTER();
+
+    std::set<sai_object_id_t> coldVids;
+
+    sai_object_id_t vid = m_translator->translateRidToVid(rid, m_switch_vid);
+
+    coldVids.insert(vid);
+
+    /* Save Switch Internal OID put in current view asic state and also
+     * in ColdVid Table discovered as cold or warm boot.
+     * Please note it is possible to discover new Switch internal OID in warm-boot also
+     * if SAI gets upgraded as part of warm-boot so we are adding to ColdVid also
+     * so that comparison logic do not remove this OID in warm-boot case. One example
+     * is SAI_SWITCH_ATTR_DEFAULT_STP_INST_ID which is discovered in warm-boot 
+     * when upgrading to new SAI Version*/
+
+
+    m_client->setDummyAsicStateObject(vid);
+
+    m_client->saveColdBootDiscoveredVids(m_switch_vid, coldVids);
+
+    SWSS_LOG_NOTICE("put switch internal discovered rid %s to Asic View and COLDVIDS", 
+                    sai_serialize_object_id(rid).c_str());
+
+}
+
 void SaiSwitch::redisSaveColdBootDiscoveredVids() const
 {
     SWSS_LOG_ENTER();

diff --git a/syncd/SaiSwitch.h b/syncd/SaiSwitch.h
@@ -299,6 +299,9 @@ namespace syncd
 
             void helperInternalOids();
 
+            void redisSaveInternalOids(
+                     _In_ sai_object_id_t rid) const;
+
             void helperLoadColdVids();
 
             void helperPopulateWarmBootVids();