From 6092d5044eb1465cbe8b3d3753218d0ec853564d Mon Sep 17 00:00:00 2001 From: Kamil Cudnik Date: Tue, 2 Nov 2021 18:27:25 +0100 Subject: [PATCH] [syncd] Add workaround for warm boot new objects (#960) --- syncd/SaiSwitch.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/syncd/SaiSwitch.cpp b/syncd/SaiSwitch.cpp index bd5b427d493f..09194df0028b 100644 --- a/syncd/SaiSwitch.cpp +++ b/syncd/SaiSwitch.cpp @@ -1186,16 +1186,23 @@ void SaiSwitch::checkWarmBootDiscoveredRids() auto ot = m_vendorSai->objectTypeQuery(rid); - SWSS_LOG_ERROR("RID %s (%s) is missing from current RID2VID map after WARM boot!", + // SWSS_LOG_ERROR("RID %s (%s) is missing from current RID2VID map after WARM boot!", + SWSS_LOG_WARN("RID %s (%s) is missing from current RID2VID map after WARM boot!", sai_serialize_object_id(rid).c_str(), sai_serialize_object_type(ot).c_str()); + // XXX workaround, put discovered object in database + + redisSetDummyAsicStateForRealObjectId(rid); + success = false; } if (!success) { - SWSS_LOG_THROW("FATAL, some discovered RIDs are not present in current RID2VID map, bug"); + // XXX workaround + //SWSS_LOG_THROW("FATAL, some discovered RIDs are not present in current RID2VID map, bug"); + SWSS_LOG_ERROR("FATAL, some discovered RIDs are not present in current RID2VID map, WORKAROUND, inserting them to ASIC_DB"); } SWSS_LOG_NOTICE("all discovered RIDs are present in current RID2VID map for switch VID %s",