[202205_1_rc] [202205] [ACL] dereg acl-rule counters during acl-table del (sonic-net#2574)

volodymyrsamotiy · volodymyrsamotiy · commit 9eec5f463fd0 · 2022-12-28T17:54:37.000+02:00
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -2525,6 +2525,12 @@ bool AclTable::clear()
     for (auto& rulepair: rules)
     {
         auto& rule = *rulepair.second;
+
+        if (rule.hasCounter())
+        {
+            m_pAclOrch->deregisterFlexCounter(rule);
+        }
+
         bool suc = rule.remove();
         if (!suc)
         {

Original file line number	Diff line number	Diff line change
`@@ -2525,6 +2525,12 @@ bool AclTable::clear()`
`2525`	`2525`	`for (auto& rulepair: rules)`
`2526`	`2526`	`{`
`2527`	`2527`	`auto& rule = *rulepair.second;`
	`2528`	`+`
	`2529`	`+ if (rule.hasCounter())`
	`2530`	`+ {`
	`2531`	`+ m_pAclOrch->deregisterFlexCounter(rule);`
	`2532`	`+ }`
	`2533`	`+`
`2528`	`2534`	`bool suc = rule.remove();`
`2529`	`2535`	`if (!suc)`
`2530`	`2536`	`{`