Skip to content

[syncd] Move logSet logGet under mutex to prevent race condition #1505

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
yejianquan merged 8 commits into from
Feb 6, 2025
Merged

[syncd] Move logSet logGet under mutex to prevent race condition #1505

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b5e6c8
[syncd] Move logSet logGet under mutex to prevent race condition
kcudnik Jan 22, 2025
b42e337
fix
kcudnik Jan 22, 2025
c0461ec
Merge branch 'master' into fix
abdosi Jan 27, 2025
eccb48c
Merge branch 'master' into fix
abdosi Jan 29, 2025
5266ee3
Merge branch 'master' into fix
kcudnik Feb 2, 2025
5b6fdbc
Merge branch 'master' into fix
kcudnik Feb 5, 2025
4472695
Merge branch 'master' into fix
kcudnik Feb 5, 2025
8de735a
Merge branch 'master' into fix
yejianquan Feb 5, 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
2 changes: 2 additions & 0 deletions syncd/VendorSai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1885,6 +1885,7 @@ sai_status_t VendorSai::logSet(
_In_ sai_api_t api,
_In_ sai_log_level_t log_level)
{
MUTEX();
SWSS_LOG_ENTER();

m_logLevelMap[api] = log_level;
Expand All @@ -1903,6 +1904,7 @@ sai_status_t VendorSai::queryApiVersion(
sai_log_level_t VendorSai::logGet(
_In_ sai_api_t api)
{
MUTEX();
SWSS_LOG_ENTER();

auto it = m_logLevelMap.find(api);
Expand Down
12 changes: 12 additions & 0 deletions unittest/syncd/TestVendorSai.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,3 +1543,15 @@ TEST(VendorSai, bulk_meter_rules)
EXPECT_EQ(SAI_STATUS_SUCCESS, sai.remove((sai_object_type_t)SAI_OBJECT_TYPE_METER_POLICY, meter_policy0));
EXPECT_EQ(SAI_STATUS_SUCCESS, sai.remove((sai_object_type_t)SAI_OBJECT_TYPE_METER_POLICY, meter_policy1));
}

TEST(VendorSai, logSet_logGet)
{
VendorSai sai;
sai.apiInitialize(0, &test_services);

EXPECT_EQ(SAI_STATUS_SUCCESS, sai.logSet(SAI_API_PORT, SAI_LOG_LEVEL_DEBUG));

EXPECT_EQ(SAI_LOG_LEVEL_DEBUG, sai.logGet(SAI_API_PORT));
EXPECT_EQ(SAI_LOG_LEVEL_NOTICE, sai.logGet(SAI_API_SWITCH));
}

Loading