[FC] process FC after apply view by stepanblyschak · Pull Request #3326 · sonic-net/sonic-swss

stepanblyschak · 2024-10-14T11:41:27Z

What I did

Simplify approach to delaying counters on warm boot and fast boot. Removed FLEX_COUNTER_DELAY_STATUS_FIELD and instead postpone all FC processing to happen after apply view to not delay data plane configuration.

The CONFIG_DB should not be updated in runtime anymore for counters to be delayed.

Why I did it

To address sonic-net/sonic-buildimage#20302.

How I verified it

Run warm-boot - make sure FC orch runs only after APPLY_VIEW.

Details if related

stepanblyschak · 2024-10-14T14:39:36Z

/azpw run

mssonicbld · 2024-10-14T14:39:39Z

/AzurePipelines run

azure-pipelines · 2024-10-14T14:39:50Z

Azure Pipelines successfully started running 1 pipeline(s).

stepanblyschak · 2024-11-13T19:27:13Z

Putting back delay for 60 sec as we found some cases where oper state update handling is delayed due to FC configuration after APPLY_VIEW

Junchao-Mellanox · 2024-11-14T01:12:28Z

orchagent/flexcounterorch.cpp

 {
    SWSS_LOG_ENTER();
+    m_delayTimer = new SelectableTimer(timespec{.tv_sec = FLEX_COUNTER_DELAY_SEC, .tv_nsec = 0});
+    if (WarmStart::isWarmStart())


Just to confirm this will also handle fast-reboot.

Junchao-Mellanox · 2024-11-14T01:14:28Z

orchagent/flexcounterorch.cpp

+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_NOTICE("Processing counters");
+    m_delayTimer->stop();


How about following?

if (!m_delayTimerExpired) { m_delayTimer->stop(); m_delayTimerExpired = true; }

Junchao-Mellanox · 2024-11-14T01:15:35Z

orchagent/flexcounterorch.cpp

    }
 }

+void FlexCounterOrch::doTask(SelectableTimer &timer)


should we delete the timer here?

orchagent/flexcounterorch.cpp

Signed-off-by: Stepan Blyschak <[email protected]>

mssonicbld · 2025-01-30T19:57:51Z

/azp run

azure-pipelines · 2025-01-30T19:58:02Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-02-05T19:52:20Z

/azp run

azure-pipelines · 2025-02-05T19:52:31Z

Azure Pipelines successfully started running 1 pipeline(s).

wen587 · 2025-02-06T00:45:27Z

orchagent/flexcounterorch.cpp

    m_deviceMetadataConfigTable(db, CFG_DEVICE_METADATA_TABLE_NAME)
 {
    SWSS_LOG_ENTER();
+    m_delayTimer = std::make_unique<SelectableTimer>(timespec{.tv_sec = FLEX_COUNTER_DELAY_SEC, .tv_nsec = 0});


@vaibhavhd , could you review the warm boot part?

stephenxs · 2025-02-07T07:43:19Z

@stepanblyschak could you rebase your PR to resolve the conflict? Thanks

mssonicbld · 2025-02-07T09:26:03Z

/azp run

azure-pipelines · 2025-02-07T09:26:15Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-02-07T10:49:42Z

/azp run

azure-pipelines · 2025-02-07T10:49:53Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2025-02-11T09:36:51Z

/azp run

azure-pipelines · 2025-02-11T09:37:03Z

Azure Pipelines successfully started running 1 pipeline(s).

liat-grozovik · 2025-02-11T09:37:30Z

@wen587 @vaibhavhd kindly reminder. this is needed to get in as other PRs are based on that. it is crucial for 202411. @bingwang-ms please help to track it as well please.

Depends on sonic-net/sonic-swss#3326. To address sonic-net/sonic-buildimage#20302.

* [FC] process FC after apply view What I did Simplify approach to delaying counters on warm boot and fast boot. Removed FLEX_COUNTER_DELAY_STATUS_FIELD and instead postpone all FC processing to happen after apply view to not delay data plane configuration. The CONFIG_DB should not be updated in runtime anymore for counters to be delayed. Why I did it To address sonic-net/sonic-buildimage#20302. How I verified it Run warm-boot - make sure FC orch runs only after APPLY_VIEW.

* [FC] process FC after apply view What I did Simplify approach to delaying counters on warm boot and fast boot. Removed FLEX_COUNTER_DELAY_STATUS_FIELD and instead postpone all FC processing to happen after apply view to not delay data plane configuration. The CONFIG_DB should not be updated in runtime anymore for counters to be delayed. Why I did it To address sonic-net/sonic-buildimage#20302. How I verified it Run warm-boot - make sure FC orch runs only after APPLY_VIEW. Signed-off-by: Baorong Liu <[email protected]>

stepanblyschak requested a review from prsunny as a code owner October 14, 2024 11:41

stepanblyschak mentioned this pull request Oct 14, 2024

[FC] remove FC delay status field sonic-net/sonic-buildimage#20495

Merged

11 tasks

bingwang-ms mentioned this pull request Oct 14, 2024

Remove runtime config update for FLEX_COUNTER_TABLE sonic-net/sonic-buildimage#20302

Closed

stepanblyschak force-pushed the fc-after-apply-view branch from da85acb to ffbd073 Compare October 15, 2024 11:35

stepanblyschak mentioned this pull request Oct 15, 2024

[FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD sonic-net/sonic-swss-common#930

Merged

stepanblyschak force-pushed the fc-after-apply-view branch from ffbd073 to 1536dfb Compare October 15, 2024 15:55

stepanblyschak added the Request for 202405 Branch label Oct 21, 2024

stepanblyschak mentioned this pull request Oct 21, 2024

[202405][FC] remove FC delay status field sonic-net/sonic-buildimage#20554

Merged

11 tasks

qiluo-msft requested review from vaibhavhd and wen587 November 11, 2024 17:51

stepanblyschak force-pushed the fc-after-apply-view branch 3 times, most recently from 97e081f to 95b1e63 Compare November 12, 2024 13:36

Junchao-Mellanox approved these changes Nov 13, 2024

View reviewed changes

mssonicbld added the Cherry Pick Conflict_202405 label Nov 13, 2024

stepanblyschak force-pushed the fc-after-apply-view branch from 6e1f7d5 to 8dca8ef Compare November 13, 2024 16:53

stepanblyschak requested a review from judyjoseph as a code owner November 13, 2024 16:53

mssonicbld removed the Cherry Pick Conflict_202405 label Nov 13, 2024

stepanblyschak force-pushed the fc-after-apply-view branch 2 times, most recently from 7f0a73e to e580645 Compare November 13, 2024 19:24

Junchao-Mellanox reviewed Nov 14, 2024

View reviewed changes

stepanblyschak added 5 commits November 14, 2024 15:46

[FC] process FC after apply view

87501b2

Signed-off-by: Stepan Blyschak <[email protected]>

Remove m_flexCounterConfigTable

47fb40f

Signed-off-by: Stepan Blyschak <[email protected]>

delay counters by 60 sec

017a569

Signed-off-by: Stepan Blyschak <[email protected]>

Delay for warm/fast start

ada9e59

Signed-off-by: Stepan Blyschak <[email protected]>

Handle review comment

956f1f6

Signed-off-by: Stepan Blyschak <[email protected]>

Merge branch 'master' into fc-after-apply-view

5600064

Merge branch 'master' into fc-after-apply-view

00455a5

wen587 reviewed Feb 6, 2025

View reviewed changes

stepanblyschak dismissed qiluo-msft’s stale review via 01e90d8 February 7, 2025 09:25

Merge branch 'master' into fc-after-apply-view

71b6513

stepanblyschak force-pushed the fc-after-apply-view branch from 01e90d8 to 71b6513 Compare February 7, 2025 10:49

Merge branch 'master' into fc-after-apply-view

bacf16b

vaibhavhd approved these changes Feb 13, 2025

View reviewed changes

bingwang-ms approved these changes Feb 14, 2025

View reviewed changes

prsunny merged commit a8a28a8 into sonic-net:master Feb 14, 2025
14 checks passed

stepanblyschak mentioned this pull request Feb 17, 2025

[202411][FC] process FC after apply view #3519

Merged

kperumalbfn added the Included in 202411 Branch label Feb 20, 2025

mssonicbld added a commit to mssonicbld/sonic-swss-common that referenced this pull request Feb 28, 2025

[FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD

4152be7

Depends on sonic-net/sonic-swss#3326. To address sonic-net/sonic-buildimage#20302.

mssonicbld mentioned this pull request Feb 28, 2025

[action] [PR:930] [FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD sonic-net/sonic-swss-common#982

Merged

mssonicbld added a commit to sonic-net/sonic-swss-common that referenced this pull request Feb 28, 2025

[FC] remove FLEX_COUNTER_DELAY_STATUS_FIELD (#982)

3bc4141

Depends on sonic-net/sonic-swss#3326. To address sonic-net/sonic-buildimage#20302.

Conversation

stepanblyschak commented Oct 14, 2024

Uh oh!

stepanblyschak commented Oct 14, 2024

Uh oh!

mssonicbld commented Oct 14, 2024

Uh oh!

azure-pipelines bot commented Oct 14, 2024

Uh oh!

stepanblyschak commented Nov 13, 2024

Uh oh!

Junchao-Mellanox Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

stepanblyschak Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

Junchao-Mellanox Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

stepanblyschak Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

Junchao-Mellanox Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

stepanblyschak Nov 14, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mssonicbld commented Jan 30, 2025

Uh oh!

azure-pipelines bot commented Jan 30, 2025

Uh oh!

mssonicbld commented Feb 5, 2025

Uh oh!

azure-pipelines bot commented Feb 5, 2025

Uh oh!

wen587 Feb 6, 2025

Choose a reason for hiding this comment

Uh oh!

stephenxs commented Feb 7, 2025

Uh oh!

mssonicbld commented Feb 7, 2025

Uh oh!

azure-pipelines bot commented Feb 7, 2025

Uh oh!

mssonicbld commented Feb 7, 2025

Uh oh!

azure-pipelines bot commented Feb 7, 2025

Uh oh!

mssonicbld commented Feb 11, 2025

Uh oh!

azure-pipelines bot commented Feb 11, 2025

Uh oh!

liat-grozovik commented Feb 11, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants