Skip to content

Orchagent SAI error handling improvements #3587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prsunny merged 11 commits into from
Jun 17, 2025
+551 −270
Merged

Orchagent SAI error handling improvements #3587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b7919a1
avoid OA crashes for all cases
prabhataravind Oct 25, 2024
07c7f7e
Add more test cases
prabhataravind May 30, 2025
afdb75b
More fixes
prabhataravind May 30, 2025
2e1da31
Add success test scenarios
prabhataravind May 31, 2025
fdc39c7
Misc fixes
prabhataravind Jun 5, 2025
9bfc046
Improve code coverage
prabhataravind Jun 6, 2025
14794df
Address comments and also add explicit return in main.cpp for SAI fai…
prabhataravind Jun 6, 2025
ab2003e
Merge branch 'master' into paravind/oa_crash_handling
dgsudharsan Jun 7, 2025
8dc544b
Merge branch 'sonic-net:master' into paravind/oa_crash_handling
prabhataravind Jun 13, 2025
76d02ac
Address review comments
prabhataravind Jun 13, 2025
7622077
Add more mock tests for coverage
prabhataravind Jun 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions orchagent/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ void syncd_apply_view()
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to notify syncd APPLY_VIEW %d", status);
handleSaiFailure(true);
handleSaiFailure(SAI_API_SWITCH, "set", status);
return;
}
}

Expand Down Expand Up @@ -701,7 +702,8 @@ int main(int argc, char **argv)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to create a switch, rv:%d", status);
handleSaiFailure(true);
handleSaiFailure(SAI_API_SWITCH, "create", status);
return EXIT_FAILURE;
}
SWSS_LOG_NOTICE("Create a switch, id:%" PRIu64, gSwitchId);

Expand Down Expand Up @@ -732,7 +734,8 @@ int main(int argc, char **argv)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to get MAC address from switch, rv:%d", status);
handleSaiFailure(true);
handleSaiFailure(SAI_API_SWITCH, "get", status);
return EXIT_FAILURE;
}
else
{
Expand All @@ -747,7 +750,8 @@ int main(int argc, char **argv)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Fail to get switch virtual router ID %d", status);
handleSaiFailure(true);
handleSaiFailure(SAI_API_SWITCH, "get", status);
return EXIT_FAILURE;
}

gVirtualRouterId = attr.value.oid;
Expand Down Expand Up @@ -789,7 +793,8 @@ int main(int argc, char **argv)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to create underlay router interface %d", status);
handleSaiFailure(true);
handleSaiFailure(SAI_API_ROUTER_INTERFACE, "create", status);
return EXIT_FAILURE;
}

SWSS_LOG_NOTICE("Created underlay router interface ID %" PRIx64, gUnderlayIfId);
Expand Down
2 changes: 1 addition & 1 deletion orchagent/orchdaemon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ void OrchDaemon::flush()
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to flush redis pipeline %d", status);
handleSaiFailure(true);
handleSaiFailure(SAI_API_SWITCH, "set", status);
}

for (auto* orch: m_orchList)
Expand Down
Loading
Loading