-
Notifications
You must be signed in to change notification settings - Fork 522
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.
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
[AclOrch]:fix issue when removing acl table that has associated acl r… #322
Conversation
try to resolve: #321 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor changes are needed. overall changes look good.
orchagent/aclorch.cpp
Outdated
{ | ||
sai_object_id_t table_oid = getTableById(table_id); | ||
|
||
if (table_oid != SAI_NULL_OBJECT_ID) | ||
{ | ||
// table already exists, delete it first | ||
if (deleteUnbindAclTable(table_oid) == SAI_STATUS_SUCCESS) | ||
// If ACL table exists, remove the table first. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you change the comment format to /**/
since all other places are following that convention.
orchagent/aclorch.cpp
Outdated
{ | ||
sai_object_id_t table_oid = getTableById(table_id); | ||
if (table_oid != SAI_NULL_OBJECT_ID) | ||
if(table_oid == SAI_NULL_OBJECT_ID) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please have one space between if
and (
orchagent/aclorch.cpp
Outdated
|
||
if (deleteUnbindAclTable(table_oid) == SAI_STATUS_SUCCESS) | ||
{ | ||
SWSS_LOG_INFO("Successfully deleted ACL table %s", table_id.c_str()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change it to NOTICE
orchagent/aclorch.cpp
Outdated
} | ||
} | ||
|
||
if (createBindAclTable(newTable, table_oid) == SAI_STATUS_SUCCESS) | ||
{ | ||
m_AclTables[table_oid] = newTable; | ||
SWSS_LOG_INFO("Successfully created ACL table %s, oid: %lX", newTable.description.c_str(), table_oid); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change it to NOTICE
orchagent/aclorch.cpp
Outdated
@@ -1222,22 +1248,29 @@ void AclOrch::doAclTableTask(Consumer &consumer) | |||
// validate and create ACL Table | |||
if (bAllAttributesOk && validateAclTable(newTable)) | |||
{ | |||
addAclTable(newTable, table_id); | |||
if(addAclTable(newTable, table_id)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add one space between all if
and (
d2c07dc
to
76aa984
Compare
…ules Signed-off-by: Sihui Han <sihan@microsoft.com>
76aa984
to
a4a537b
Compare
* msft_github/master: [swssconfig]: Update Mellanox buffer profile template to work with an incomplete minigraph (sonic-net#332) [portsyncd]: Remove deprecated sample file port_config.ini (sonic-net#330) [portsyncd]: Remove unused LAG related tables (sonic-net#329) [tunnelorch]: Minor comment update [aclorch]: Fix crashing when removing ACL table that has associated ACL rules (sonic-net#322) [pfcwdorch]: Initial support (sonic-net#317) [swssconfig]: Update buffer profile template to work with CONF_DB (sonic-net#319) [aclorch]: Refactor doAclTableTask and doAclRuleTask (sonic-net#318) [swssconfig]: Add Mellanox PG buffer profiles based on port configuration (sonic-net#301) [switchorch]: Add SwitchOrch to deal with switch attributes changes (sonic-net#314) [github]: Update pull request template comments [github]: Add pull request template (sonic-net#313) Optimize orch performance by pops() (sonic-net#312) Refactor TableConsumable (sonic-net#291) [buffer]: Remove failed tasks from the m_toSync queue (sonic-net#308) [qos]: Remove failed tasks from the m_toSync queue (sonic-net#306) [aclorch]: Add match TC support for ACL rule (sonic-net#302) [orchagent]: Set log recording directory before enable recording (sonic-net#300) [orchagent]: Remove duplicate SwSS recording file set code (sonic-net#298) Fix port speed validation (sonic-net#288) [fdborch]: Fix FdbOrch code to work upon SAI v1.0 (sonic-net#284) [config]: Add BGPv6 COPP in 00-copp.config.json (sonic-net#281) [aclorch]: Fix match DSCP attribute value mask length to 0x3F [mirrororch]: Set the VLAN header only when the packet is mirrored to a VLAN (sonic-net#282) [swssconfig]: Log errors instead of throwing exception when file open fails (sonic-net#277) [aclorch]: Remove wrong table attribute (sonic-net#280) [aclorch]: Fix remove_acl_counter function to remove the counter (sonic-net#274) [copporch]: Add SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY support and refactor code (sonic-net#270) [mirrororch]: Add SAI_MIRROR_SESSION_ATTR_VLAN_HEADER_VALID (sonic-net#269) [bufferorch]: Add SAI_BUFFER_PROFILE_THRESHOLD_MODE_* (sonic-net#271) [aclorch]: Minor logs fix [orchagent]: Update recording file name to swss.rec [Make]: Fix type conversions and add more warnings (sonic-net#267) [aclorch]: Fix ACL table group attribute type issue (sonic-net#268) [portsorch]: Update default bridge port removal logic (sonic-net#263) [routeorch]: Need to set drop route next hop ID to NULL (sonic-net#261) [portsorch]: Remove SAI_PORT_ATTR_BIND_MODE (sonic-net#262) [portsorch]: Create a bridge port with admin status set to UP (sonic-net#259) Revert "[portsorch]: Set port bind mode after adding VLAN member" (sonic-net#258) [orchagent]: Temporarily fix pre-allocated bridge_port_list size (sonic-net#256) [saihelper]: Create initSaiRedis function and put related code inside it (sonic-net#254) [portsorch]: Set port bind mode after adding VLAN member (sonic-net#251) [orchagent]: Create the switch with source MAC address (sonic-net#253) [copporch]: Add UDLD entry in COPP (sonic-net#252) [orchagent]: Support LAG/VLAN with SAI 1.0 (sonic-net#250) use vlan oid instead of vlan id (sonic-net#247) Fix getBridgePort: handle non existing bridge_port_id Integration for SAI v1.0.1 Remove vlan member before removing bridge port Fix SAI functional calls Fix: store bridge ports at initialization Refactor vector<attr> Resolve review comments Implement bridge port in portsorch Fix initSystemAclTable: bind system ACL to each port Refactor: port owns acl table group Resolve code review comments Resolve code review comments Adpat SAIv1.0 headers and fix compilation errors
* Refix: Validate acl.json after parsing, add unit test * Include test input files in package
* [counter]: support enable/disable counter query Signed-off-by: Sihui Han <sihan@microsoft.com> * Set counter polling by default disabled Signed-off-by: Sihui Han <sihan@microsoft.com>
…
What I did
Change the logic of doing AclTable task and AclRule task, mainly:
Why I did it
Orchagent crashes when removing AclTable with associate rules. Need to change the current logic.
How I verified it
Details if related