[Flex-counters] Fix the delay of flex counters flow to prevent infinite loop (#1899)

shlomibitton · web-flow · commit 7a0ec8f625ee · 2021-09-09T11:22:58.000-07:00
* Fix delay flex counters flow to prevent infinite loop
Signed-off-by: Shlomi Bitton &lt;shlomibi@nvidia.com&gt;
diff --git a/orchagent/flexcounterorch.cpp b/orchagent/flexcounterorch.cpp
@@ -86,10 +86,11 @@ void FlexCounterOrch::doTask(Consumer &consumer)
 
         if (op == SET_COMMAND)
         {
-            auto it = std::find(std::begin(data), std::end(data), FieldValueTuple(FLEX_COUNTER_DELAY_STATUS_FIELD, "true"));
+            auto itDelay = std::find(std::begin(data), std::end(data), FieldValueTuple(FLEX_COUNTER_DELAY_STATUS_FIELD, "true"));
 
-            if (it != data.end())
+            if (itDelay != data.end())
             {
+                consumer.m_toSync.erase(it++);
                 continue;
             }
             for (auto valuePair:data)

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,11 @@ void FlexCounterOrch::doTask(Consumer &consumer)`
`86`	`86`
`87`	`87`	`if (op == SET_COMMAND)`
`88`	`88`	`{`
`89`		`- auto it = std::find(std::begin(data), std::end(data), FieldValueTuple(FLEX_COUNTER_DELAY_STATUS_FIELD, "true"));`
	`89`	`+ auto itDelay = std::find(std::begin(data), std::end(data), FieldValueTuple(FLEX_COUNTER_DELAY_STATUS_FIELD, "true"));`
`90`	`90`
`91`		`- if (it != data.end())`
	`91`	`+ if (itDelay != data.end())`
`92`	`92`	`{`
	`93`	`+ consumer.m_toSync.erase(it++);`
`93`	`94`	`continue;`
`94`	`95`	`}`
`95`	`96`	`for (auto valuePair:data)`