Skip to content

Commit 14a863a

Browse files
authored
[warmboot] Add workaround for INIT_VIEW failure (#1252)
why change is needed "SaiGetHardwareInfo" is now returning string "none" instead of empty string (""), which is causing INIT_VIEW failure: May 26 18:57:33.577868 NOTICE syncd#syncd: :- onSwitchCreateInInitViewMode: new switch oid:0x21000000000000 contains hardware info: '' May 26 18:57:33.577868 ERR syncd#syncd: :- onSwitchCreateInInitViewMode: hardware info mismatch: current 'none' vs new '' May 26 18:57:33.578017 ERR syncd#syncd: :- run: Runtime error: :- onSwitchCreateInInitViewMode: hardware info mismatch: current 'none' vs new '' Adding this change as a temp workaround before CSP is resolved with BRCM. how I verify Test syncd build on lab device, able to pass INIT_VIEW stage. sign-off: Jing Zhang [email protected]
1 parent abb02a5 commit 14a863a

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

syncd/Syncd.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -4309,6 +4309,13 @@ void Syncd::onSwitchCreateInInitViewMode(
43094309
sai_serialize_object_id(switchVid).c_str(),
43104310
newHw.c_str());
43114311

4312+
/*
4313+
* The line below is added due to a behavior change of SAI call.
4314+
*
4315+
* TODO: remove the line when SAI vendor agrees fix on their end.
4316+
*/
4317+
currentHw = currentHw == "none"? "" : currentHw;
4318+
43124319
if (currentHw != newHw)
43134320
{
43144321
SWSS_LOG_THROW("hardware info mismatch: current '%s' vs new '%s'", currentHw.c_str(), newHw.c_str());

0 commit comments

Comments
 (0)