Skip to content

[trim]: Update log level severity to avoid errors during capabilities query #3916

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
dgsudharsan merged 3 commits into from
Oct 16, 2025
+39 −56
Merged

[trim]: Update log level severity to avoid errors during capabilities query #3916

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
762682f
[trim]: Update log level severity to avoid errors during attribute/en…
nazariig Oct 3, 2025
14e2bed
Merge branch 'master' into master-trim-log-lvl
dgsudharsan Oct 15, 2025
ce44470
Merge branch 'master' into master-trim-log-lvl
dgsudharsan Oct 16, 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
95 changes: 39 additions & 56 deletions orchagent/switch/trimming/capabilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@ static std::string toStr(const std::set<sai_packet_trim_queue_resolution_mode_t>
return join(",", strList.cbegin(), strList.cend());
}

static std::string toStr(sai_status_t value)
{
const auto *name = sai_metadata_get_status_name(value);

return name != nullptr ? name : "UNKNOWN";
}

static std::string toStr(sai_uint8_t value)
{
return std::to_string(value);
Expand Down Expand Up @@ -297,9 +304,10 @@ void SwitchTrimmingCapabilities::queryTrimSizeAttrCapabilities()
);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR(
"Failed to get attribute(%s) capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_SIZE).c_str()
SWSS_LOG_NOTICE(
"Attribute(%s) capabilities are not available: unexpected status(%s)",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_SIZE).c_str(),
toStr(status).c_str()
);
return;
}
Expand All @@ -324,19 +332,12 @@ void SwitchTrimmingCapabilities::queryTrimDscpModeEnumCapabilities()
auto status = queryEnumCapabilitiesSai(
mList, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE
);
if (status == SAI_STATUS_NOT_SUPPORTED)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_NOTICE(
"Attribute not supported(%s) to query enum value capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str()
);
return;
}
else if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR(
"Failed to get attribute(%s) enum value capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str()
"Attribute(%s) enum value capabilities are not available: unexpected status(%s)",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str(),
toStr(status).c_str()
);
return;
}
Expand Down Expand Up @@ -377,19 +378,12 @@ void SwitchTrimmingCapabilities::queryTrimDscpModeAttrCapabilities()
auto status = queryAttrCapabilitiesSai(
attrCap, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE
);
if (status == SAI_STATUS_NOT_SUPPORTED)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_NOTICE(
"Attribute not supported(%s) to query attr vapabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str()
);
return;
}
else if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR(
"Failed to get attribute(%s) capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str()
"Attribute(%s) capabilities are not available: unexpected status(%s)",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str(),
toStr(status).c_str()
);
return;
}
Expand Down Expand Up @@ -417,9 +411,10 @@ void SwitchTrimmingCapabilities::queryTrimDscpAttrCapabilities()
);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR(
"Failed to get attribute(%s) capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_VALUE).c_str()
SWSS_LOG_NOTICE(
"Attribute(%s) capabilities are not available: unexpected status(%s)",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_VALUE).c_str(),
toStr(status).c_str()
);
return;
}
Expand Down Expand Up @@ -447,9 +442,10 @@ void SwitchTrimmingCapabilities::queryTrimTcAttrCapabilities()
);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR(
"Failed to get attribute(%s) capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_TC_VALUE).c_str()
SWSS_LOG_NOTICE(
"Attribute(%s) capabilities are not available: unexpected status(%s)",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_TC_VALUE).c_str(),
toStr(status).c_str()
);
return;
}
Expand All @@ -474,19 +470,12 @@ void SwitchTrimmingCapabilities::queryTrimQueueModeEnumCapabilities()
auto status = queryEnumCapabilitiesSai(
mList, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE
);
if (status == SAI_STATUS_NOT_SUPPORTED)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_NOTICE(
"Attribute not supported(%s) to query enum value capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str()
);
return;
}
else if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR(
"Failed to get attribute(%s) enum value capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str()
"Attribute(%s) enum value capabilities are not available: unexpected status(%s)",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str(),
toStr(status).c_str()
);
return;
}
Expand Down Expand Up @@ -514,19 +503,12 @@ void SwitchTrimmingCapabilities::queryTrimQueueModeAttrCapabilities()
auto status = queryAttrCapabilitiesSai(
attrCap, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE
);
if (status == SAI_STATUS_NOT_SUPPORTED)
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_NOTICE(
"Attribute not supported(%s) to query attr capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str()
);
return;
}
else if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR(
"Failed to get attribute(%s) capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str()
"Attribute(%s) capabilities are not available: unexpected status(%s)",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str(),
toStr(status).c_str()
);
return;
}
Expand Down Expand Up @@ -554,9 +536,10 @@ void SwitchTrimmingCapabilities::queryTrimQueueIndexAttrCapabilities()
);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR(
"Failed to get attribute(%s) capabilities",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_INDEX).c_str()
SWSS_LOG_NOTICE(
"Attribute(%s) capabilities are not available: unexpected status(%s)",
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_INDEX).c_str(),
toStr(status).c_str()
);
return;
}
Expand Down
Loading