Skip to content

Fix issue with update ACL TABLE CRM error #498

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

Closed
JaredLius wants to merge 9 commits into from
Closed

Fix issue with update ACL TABLE CRM error #498

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ce6d90
The mtu configuration on the port cannot be updated if the fec config…
leoli-nps Apr 11, 2018
da0e70c
Revert "The mtu configuration on the port cannot be updated if the fe…
leoli-nps Apr 11, 2018
a1e0f69
[Portsorch]: The mtu configuration on the port cannot be updated if t…
leoli-nps Apr 11, 2018
96cbb68
Fix issue with update ACL TABLE CRM error
May 9, 2018
3d13a7c
Revert "Fix issue with update ACL TABLE CRM error"
May 10, 2018
f933995
Merge remote-tracking branch 'upstream/master'
May 10, 2018
d639134
Fix issue with update ACL TABLE CRM error
May 10, 2018
12e5bea
[Portsorch]: Add lag-name and oid map to counter table COUNTERS_PORT_…
leoli-nps May 21, 2018
8680cd5
Revert "[Portsorch]: Add lag-name and oid map to counter table COUNTE…
leoli-nps May 22, 2018
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
3 changes: 2 additions & 1 deletion orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,8 @@ bool AclTable::create()

if (status == SAI_STATUS_SUCCESS)
{
gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_TABLE, (sai_acl_stage_t) attr.value.s32, SAI_ACL_BIND_POINT_TYPE_PORT);
sai_acl_stage_t acl_stage = (stage == ACL_STAGE_INGRESS) ? SAI_ACL_STAGE_INGRESS : SAI_ACL_STAGE_EGRESS;
gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_TABLE, acl_stage, SAI_ACL_BIND_POINT_TYPE_PORT);
}

return status == SAI_STATUS_SUCCESS;
Expand Down
5 changes: 4 additions & 1 deletion orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,9 @@ bool PortsOrch::bindAclTable(sai_object_id_t id, sai_object_id_t table_oid, sai_
port.m_egress_acl_table_group_id = groupOid;
}

gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_GROUP, (sai_acl_stage_t) group_attr.value.s32, SAI_ACL_BIND_POINT_TYPE_PORT);
sai_acl_stage_t acl_stage = ingress ? SAI_ACL_STAGE_INGRESS : SAI_ACL_STAGE_EGRESS;
Copy link
Copy Markdown
Collaborator

@prsunny prsunny May 10, 2018

Choose a reason for hiding this comment

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

This was a bug that was fixed and merged recently. Can you check the latest code?

Copy link
Copy Markdown
Contributor Author

@JaredLius JaredLius May 10, 2018

Choose a reason for hiding this comment

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

I have checked the latest code on master branch, but did not see the fix code. Could you please tell me in which commit it merged? thank you.

Copy link
Copy Markdown
Collaborator

@prsunny prsunny May 10, 2018

Choose a reason for hiding this comment

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

#496


gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_GROUP, acl_stage, SAI_ACL_BIND_POINT_TYPE_PORT);

switch (port.m_type)
{
Expand Down Expand Up @@ -1274,6 +1276,7 @@ void PortsOrch::doPortTask(Consumer &consumer)
if (setPortMtu(p.m_port_id, mtu))
{
p.m_mtu = mtu;
m_portList[alias] = p;
SWSS_LOG_NOTICE("Set port %s MTU to %u", alias.c_str(), mtu);
}
else
Expand Down
2 changes: 1 addition & 1 deletion orchagent/qosorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ sai_object_id_t QosOrch::initSystemAclTable()
}
SWSS_LOG_NOTICE("Create a system ACL table for ECN coloring");

gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_TABLE, (sai_acl_stage_t) attr.value.s32, SAI_ACL_BIND_POINT_TYPE_PORT);
gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_TABLE, SAI_ACL_STAGE_INGRESS, SAI_ACL_BIND_POINT_TYPE_PORT);

for (auto& pair: gPortsOrch->getAllPorts())
{
Expand Down