From 58e7d8413fafd6d117d8a5bd0938dfbda9dfdd8f Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Wed, 25 Dec 2024 13:58:50 +0000 Subject: [PATCH] Re-organize the code to avoid conflict in cherry-pick Signed-off-by: Stephen Sun --- orchagent/flexcounterorch.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/orchagent/flexcounterorch.cpp b/orchagent/flexcounterorch.cpp index 697ec6b302b..6c2b2c83411 100644 --- a/orchagent/flexcounterorch.cpp +++ b/orchagent/flexcounterorch.cpp @@ -143,6 +143,14 @@ void FlexCounterOrch::doTask(Consumer &consumer) } } } + else if (field == BULK_CHUNK_SIZE_FIELD) + { + bulk_chunk_size = value; + } + else if (field == BULK_CHUNK_SIZE_PER_PREFIX_FIELD) + { + bulk_chunk_size_per_counter = value; + } else if(field == FLEX_COUNTER_STATUS_FIELD) { // Currently, the counters are disabled for polling by default @@ -253,14 +261,6 @@ void FlexCounterOrch::doTask(Consumer &consumer) // If it is exist and the value is 'true' we need to skip the iteration in order to delay the counter creation. // The field will clear out and counter will be created when enable_counters script is called. } - else if (field == BULK_CHUNK_SIZE_FIELD) - { - bulk_chunk_size = value; - } - else if (field == BULK_CHUNK_SIZE_PER_PREFIX_FIELD) - { - bulk_chunk_size_per_counter = value; - } else { SWSS_LOG_NOTICE("Unsupported field %s", field.c_str());