Skip to content

Fixed orchagent crash in VM with the Qos BUFFER_QUEUE|system-port|Queue-id-range config #3050

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 4 commits into from
Feb 24, 2024
Merged

Fixed orchagent crash in VM with the Qos BUFFER_QUEUE|system-port|Queue-id-range config #3050

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a27ec92
Fixed orchagent crash in VM with the Qos BUFFER_QUEUE|system-port|Que…
saksarav-nokia Feb 15, 2024
51dafad
Add/Remove Port Queue Counters only for non VOQ switch when the BUFEE…
saksarav-nokia Feb 22, 2024
1aeadae
Revert "Fixed orchagent crash in VM with the Qos BUFFER_QUEUE|system-…
saksarav-nokia Feb 22, 2024
64ae2c5
Fixed the code comment
saksarav-nokia Feb 22, 2024
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
6 changes: 5 additions & 1 deletion orchagent/bufferorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,7 @@ task_process_status BufferOrch::processQueue(KeyOpFieldsValuesTuple &tuple)
{
SWSS_LOG_DEBUG("processing queue:%zd", ind);
sai_object_id_t queue_id;
string queues;

if (gMySwitchType == "voq")
{
Expand All @@ -936,6 +937,7 @@ task_process_status BufferOrch::processQueue(KeyOpFieldsValuesTuple &tuple)
return task_process_status::task_invalid_entry;
}
queue_id = queue_ids[ind];
queues = tokens[3];
}
else
{
Expand All @@ -951,11 +953,13 @@ task_process_status BufferOrch::processQueue(KeyOpFieldsValuesTuple &tuple)
return task_process_status::task_need_retry;
}
queue_id = port.m_queue_ids[ind];
queues = tokens[1];
}

if (need_update_sai)
{
SWSS_LOG_DEBUG("Applying buffer profile:0x%" PRIx64 " to queue index:%zd, queue sai_id:0x%" PRIx64, sai_buffer_profile, ind, queue_id);

sai_status_t sai_status = sai_queue_api->set_queue_attribute(queue_id, &attr);
if (sai_status != SAI_STATUS_SUCCESS)
{
Expand All @@ -970,7 +974,7 @@ task_process_status BufferOrch::processQueue(KeyOpFieldsValuesTuple &tuple)
else
{
auto flexCounterOrch = gDirectory.get<FlexCounterOrch*>();
auto queues = tokens[1];

if (op == SET_COMMAND &&
(flexCounterOrch->getQueueCountersState() || flexCounterOrch->getQueueWatermarkCountersState()))
{
Expand Down