File tree 6 files changed +10
-1058
lines changed
6 files changed +10
-1058
lines changed Original file line number Diff line number Diff line change @@ -53,6 +53,11 @@ SaiSwitch::SaiSwitch(
53
53
54
54
helperDiscover ();
55
55
56
+ if (warmBoot)
57
+ {
58
+ checkWarmBootDiscoveredRids ();
59
+ }
60
+
56
61
helperSaveDiscoveredObjectsToRedis ();
57
62
58
63
helperInternalOids ();
@@ -70,11 +75,6 @@ SaiSwitch::SaiSwitch(
70
75
{
71
76
saiGetMacAddress (m_default_mac_address);
72
77
}
73
-
74
- if (warmBoot)
75
- {
76
- checkWarmBootDiscoveredRids ();
77
- }
78
78
}
79
79
80
80
/*
@@ -1184,8 +1184,11 @@ void SaiSwitch::checkWarmBootDiscoveredRids()
1184
1184
if (rid2vid.find (rid) != rid2vid.end ())
1185
1185
continue ;
1186
1186
1187
- SWSS_LOG_ERROR (" RID %s is missing from current RID2VID map after WARM boot!" ,
1188
- sai_serialize_object_id (rid).c_str ());
1187
+ auto ot = m_vendorSai->objectTypeQuery (rid);
1188
+
1189
+ SWSS_LOG_ERROR (" RID %s (%s) is missing from current RID2VID map after WARM boot!" ,
1190
+ sai_serialize_object_id (rid).c_str (),
1191
+ sai_serialize_object_type (ot).c_str ());
1189
1192
1190
1193
success = false ;
1191
1194
}
@@ -1198,4 +1201,3 @@ void SaiSwitch::checkWarmBootDiscoveredRids()
1198
1201
SWSS_LOG_NOTICE (" all discovered RIDs are present in current RID2VID map for switch VID %s" ,
1199
1202
sai_serialize_object_id (m_switch_vid).c_str ());
1200
1203
}
1201
-
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments