Skip to content

[fpmsyncd][WR] Relax the static schema constraint for ROUTE_TABLE#2981

Merged
dgsudharsan merged 7 commits intosonic-net:masterfrom
vivekrnv:fpmsyncd_wr_fix
Dec 8, 2023
Merged

[fpmsyncd][WR] Relax the static schema constraint for ROUTE_TABLE#2981
dgsudharsan merged 7 commits intosonic-net:masterfrom
vivekrnv:fpmsyncd_wr_fix

Conversation

@vivekrnv
Copy link
Copy Markdown
Contributor

@vivekrnv vivekrnv commented Dec 6, 2023 •
edited
Loading

What I did

Remove the assert when the schema changes and in that case, imply a diff and pass it down to orchagent. Fixed sonic-net/sonic-buildimage#17322

Why I did it

warmRestartHelper assumes a static schema during warm upgrade reconciliation. To overcome this, the db_migrator is used to add the missing fields in the ROUTE_TABLE. This is leading to control plane downtime exceeding 90 sec.

How I verified it

UT:

vkarri@11ca2f5ec619:/sonic/src/sonic-swss/tests/mock_tests$ ./tests --gtest_filter="*WRHelper*"
Running main() from /build/googletest-YnT0O3/googletest-1.10.0.20201025/googletest/src/gtest_main.cc
Note: Google Test filter = *WRHelper*
[==========] Running 1 test from 1 test suite.
[----------] Global test environment set-up.
[----------] 1 test from WRHelperTest
[ RUN      ] WRHelperTest.testReconciliation
[       OK ] WRHelperTest.testReconciliation (1 ms)
[----------] 1 test from WRHelperTest (1 ms total)

[----------] Global test environment tear-down
[==========] 1 test from 1 test suite ran. (1 ms total)
[  PASSED  ] 1 test.

Details if related

@vivekrnv vivekrnv requested a review from prsunny as a code owner December 6, 2023 04:29
dgsudharsan
dgsudharsan previously approved these changes Dec 6, 2023
View reviewed changes
@dgsudharsan dgsudharsan mentioned this pull request Dec 6, 2023
Merged
prsunny
prsunny reviewed Dec 7, 2023
View reviewed changes
@prsunny prsunny requested review from qiluo-msft and yxieca December 7, 2023 00:29
@vivekrnv vivekrnv mentioned this pull request Dec 7, 2023
Merged
@dgsudharsan dgsudharsan requested a review from prsunny December 7, 2023 16:52
prsunny
prsunny previously approved these changes Dec 7, 2023
View reviewed changes
@prsunny
Copy link
Copy Markdown
Collaborator

prsunny commented Dec 7, 2023

wait for @yxieca to signoff

dgsudharsan
dgsudharsan previously approved these changes Dec 7, 2023
View reviewed changes
@vivekrnv vivekrnv dismissed stale reviews from dgsudharsan and prsunny via 4f0c597 December 7, 2023 18:35
dgsudharsan
dgsudharsan previously approved these changes Dec 7, 2023
View reviewed changes
StormLiangMS pushed a commit that referenced this pull request Dec 15, 2023
@vivekrnv
[fpmsyncd][WR] Relax the static schema constraint for ROUTE_TABLE (#2981
1377bb4 
) (#2983)

Remove the assert when the schema changes and in that case, imply a diff and pass it down to orchagent
yxieca pushed a commit to sonic-net/sonic-utilities that referenced this pull request Dec 15, 2023
@dgsudharsan
[db_migrator]Remove route migration (#3068)
21b1285 
Fix sonic-net/sonic-buildimage#17322
Remove the route migration operation from db_migrator. The route migration operation takes a lot of time as indicated in the below issue. This is not necessary since the hardcoded assert in the fpmsyncd on new fields is removed in sonic-net/sonic-swss#2981
mssonicbld pushed a commit to mssonicbld/sonic-utilities that referenced this pull request Dec 16, 2023
@dgsudharsan @mssonicbld
[db_migrator]Remove route migration (sonic-net#3068)
30704f3 
Fix sonic-net/sonic-buildimage#17322
Remove the route migration operation from db_migrator. The route migration operation takes a lot of time as indicated in the below issue. This is not necessary since the hardcoded assert in the fpmsyncd on new fields is removed in sonic-net/sonic-swss#2981
@mssonicbld mssonicbld mentioned this pull request Dec 16, 2023
Merged
mssonicbld pushed a commit to sonic-net/sonic-utilities that referenced this pull request Dec 16, 2023
@dgsudharsan @mssonicbld
[db_migrator]Remove route migration (#3068)
1a59a6d 
Fix sonic-net/sonic-buildimage#17322
Remove the route migration operation from db_migrator. The route migration operation takes a lot of time as indicated in the below issue. This is not necessary since the hardcoded assert in the fpmsyncd on new fields is removed in sonic-net/sonic-swss#2981
mssonicbld pushed a commit to mssonicbld/sonic-swss that referenced this pull request Feb 2, 2024
@vivekrnv @mssonicbld
[fpmsyncd][WR] Relax the static schema constraint for ROUTE_TABLE (so…
b567603 
…nic-net#2981)

Remove the assert when the schema changes and in that case, imply a diff and pass it down to orchagent
@mssonicbld mssonicbld mentioned this pull request Feb 2, 2024
Closed
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Feb 2, 2024

Cherry-pick PR to 202311: #3030

mssonicbld pushed a commit to mssonicbld/sonic-utilities that referenced this pull request Feb 2, 2024
@dgsudharsan @mssonicbld
[db_migrator]Remove route migration (sonic-net#3068)
5ac6750 
Fix sonic-net/sonic-buildimage#17322
Remove the route migration operation from db_migrator. The route migration operation takes a lot of time as indicated in the below issue. This is not necessary since the hardcoded assert in the fpmsyncd on new fields is removed in sonic-net/sonic-swss#2981
@mssonicbld mssonicbld mentioned this pull request Feb 2, 2024
Merged
mssonicbld pushed a commit to sonic-net/sonic-utilities that referenced this pull request Feb 2, 2024
@dgsudharsan @mssonicbld
[db_migrator]Remove route migration (#3068)
1515edc 
Fix sonic-net/sonic-buildimage#17322
Remove the route migration operation from db_migrator. The route migration operation takes a lot of time as indicated in the below issue. This is not necessary since the hardcoded assert in the fpmsyncd on new fields is removed in sonic-net/sonic-swss#2981
mssonicbld pushed a commit to mssonicbld/sonic-swss that referenced this pull request Mar 4, 2024
@vivekrnv @mssonicbld
[fpmsyncd][WR] Relax the static schema constraint for ROUTE_TABLE (so…
f0659ec 
…nic-net#2981)

Remove the assert when the schema changes and in that case, imply a diff and pass it down to orchagent
@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Mar 4, 2024

@vivekrnv cherry pick PR didn't pass PR checker. Please check!!! Auto cherry pick PR will be closed in 3 days.
#3030

vivekrnv added a commit to vivekrnv/sonic-swss that referenced this pull request Mar 4, 2024
@vivekrnv
[fpmsyncd][WR] Relax the static schema constraint for ROUTE_TABLE (so…
6d38492 
…nic-net#2981)

Remove the assert when the schema changes and in that case, imply a diff and pass it down to orchagent
@vivekrnv vivekrnv mentioned this pull request Mar 4, 2024
Merged
yxieca added a commit that referenced this pull request Apr 5, 2024
@vivekrnv @yxieca
[fpmsyncd][WR] Relax the static schema constraint for ROUTE_TABLE (#2981
f83a0ba 
) (#3067)

Remove the assert when the schema changes and in that case, imply a diff and pass it down to orchagent

Co-authored-by: Ying Xie <[email protected]>
nmoray pushed a commit to nmoray/sonic-utilities that referenced this pull request Jun 25, 2025
@dgsudharsan @nmoray
[db_migrator]Remove route migration (sonic-net#3068)
6250c3a 
Fix sonic-net/sonic-buildimage#17322
Remove the route migration operation from db_migrator. The route migration operation takes a lot of time as indicated in the below issue. This is not necessary since the hardcoded assert in the fpmsyncd on new fields is removed in sonic-net/sonic-swss#2981
Janetxxx pushed a commit to Janetxxx/sonic-swss that referenced this pull request Nov 10, 2025
@vivekrnv
[fpmsyncd][WR] Relax the static schema constraint for ROUTE_TABLE (so…
d9df642 
…nic-net#2981)

Remove the assert when the schema changes and in that case, imply a diff and pass it down to orchagent
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dgsudharsan dgsudharsan dgsudharsan approved these changes

@stepanblyschak stepanblyschak stepanblyschak approved these changes

@prsunny prsunny prsunny left review comments

@yxieca yxieca yxieca left review comments

@qiluo-msft qiluo-msft Awaiting requested review from qiluo-msft

Assignees

No one assigned

Labels

Approved for 202311 Branch Cherry Pick Conflict_202305 Included in 202305 Branch Included in 202311 Branch Request for 202305 Branch Request for 202311 Branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[warm-upgrade] db_migrator.py takes more time to run due to numerous entries to migrate in APPL_DB ROUTE_TABLE

9 participants

@vivekrnv @prsunny @yxieca @dgsudharsan @mssonicbld @stepanblyschak @liushilongbuaa @liat-grozovik @StormLiangMS