[FC] process FC after apply view #3326
Open
+91
−54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 tasks
|
/azpw run |
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
stepanblyschak
force-pushed
the
fc-after-apply-view
branch
from
da85acb to
ffbd073
Compare
stepanblyschak
force-pushed
the
fc-after-apply-view
branch
from
ffbd073 to
1536dfb
Compare
11 tasks
stepanblyschak
force-pushed
the
fc-after-apply-view
branch
3 times, most recently
from
97e081f to
95b1e63
Compare
Junchao-Mellanox
approved these changes
Nov 13, 2024
stepanblyschak
force-pushed
the
fc-after-apply-view
branch
from
6e1f7d5 to
8dca8ef
Compare
stepanblyschak
force-pushed
the
fc-after-apply-view
branch
2 times, most recently
from
7f0a73e to
e580645
Compare
|
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 |
| m_bufferQueueConfigTable(db, CFG_BUFFER_QUEUE_TABLE_NAME), | ||
| m_bufferPgConfigTable(db, CFG_BUFFER_PG_TABLE_NAME), | ||
| m_deviceMetadataConfigTable(db, CFG_DEVICE_METADATA_TABLE_NAME) | ||
| { | ||
| SWSS_LOG_ENTER(); | ||
| m_delayTimer = new SelectableTimer(timespec{.tv_sec = FLEX_COUNTER_DELAY_SEC, .tv_nsec = 0}); | ||
| if (WarmStart::isWarmStart()) |
There was a problem hiding this comment.
Just to confirm this will also handle fast-reboot.
| SWSS_LOG_ENTER(); | ||
|
|
||
| SWSS_LOG_NOTICE("Processing counters"); | ||
| m_delayTimer->stop(); |
There was a problem hiding this comment.
How about following?
if (!m_delayTimerExpired)
{
m_delayTimer->stop();
m_delayTimerExpired = true;
}
orchagent/flexcounterorch.cpp
Outdated
| @@ -254,6 +258,15 @@ void FlexCounterOrch::doTask(Consumer &consumer) | |||
| } | |||
| } | |||
|
|
|||
| void FlexCounterOrch::doTask(SelectableTimer &timer) | |||
There was a problem hiding this comment.
should we delete the timer here?
Signed-off-by: Stepan Blyschak <[email protected]>
Signed-off-by: Stepan Blyschak <[email protected]>
Signed-off-by: Stepan Blyschak <[email protected]>
Signed-off-by: Stepan Blyschak <[email protected]>
Signed-off-by: Stepan Blyschak <[email protected]>
qiluo-msft
previously approved these changes
Jan 17, 2025
VladimirKuk
pushed a commit
to Marvell-switching/sonic-buildimage
that referenced
this pull request
Jan 21, 2025
Related to sonic-net/sonic-swss#3326. Why I did it 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. To address sonic-net#20302. Work item tracking Microsoft ADO (number only): How I did it Removed FLEX_COUNTER_DELAY_STATUS_FIELD set in enable_counters.py. How to verify it Run warm-boot - make sure FC orch runs only after APPLY_VIEW.
stepanblyschak
pushed a commit
to stepanblyschak/sonic-swss
that referenced
this pull request
Jan 27, 2025
stepanblyschak
pushed a commit
to stepanblyschak/sonic-swss
that referenced
this pull request
Jan 27, 2025
stepanblyschak
pushed a commit
to stepanblyschak/sonic-swss
that referenced
this pull request
Jan 27, 2025
stepanblyschak
pushed a commit
to stepanblyschak/sonic-swss
that referenced
this pull request
Jan 27, 2025
stepanblyschak
pushed a commit
to stepanblyschak/sonic-swss
that referenced
this pull request
Jan 27, 2025
|
Infra issue with tests: failure to install dotnet package: Restarting |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@qiluo-msft @bingwang-ms @vaibhavhd Can be merged? |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
wen587
reviewed
Feb 6, 2025
| m_bufferQueueConfigTable(db, CFG_BUFFER_QUEUE_TABLE_NAME), | ||
| m_bufferPgConfigTable(db, CFG_BUFFER_PG_TABLE_NAME), | ||
| 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}); |
There was a problem hiding this comment.
@vaibhavhd , could you review the warm boot part?
|
@stepanblyschak could you rebase your PR to resolve the conflict? Thanks |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
stepanblyschak
force-pushed
the
fc-after-apply-view
branch
from
01e90d8 to
71b6513
Compare
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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