Skip to content
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

Jump to bottom

[COPP]If copp group is configured using cfgdb, duplicate trapids will… #2509

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[COPP]If copp group is configured using cfgdb, duplicate trapids will… #2509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions cfgmgr/coppmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,6 @@ void CoppMgr::doCoppTrapTask(Consumer &consumer)
m_coppTrapConfMap[key].trap_ids);
}

m_coppTrapConfMap[key].trap_group = trap_group;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this will affect the logic inside addTrap since it is used to determine isTrapIdDisabled. I recommend instead to save the old trap group in a different variable and use it to compare below. You can remove the assignment at the end of the if loop.
Please also add UT to cover this case

m_coppTrapConfMap[key].trap_ids = trap_ids;
m_coppTrapConfMap[key].is_always_enabled = is_always_enabled;
addTrap(trap_ids, trap_group);

/* When the trap table's trap group is changed, the old trap group
Expand Down