vlanmgr changes related to EVPN VxLan warmboot #1460
Merged
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
|
@heidinet2007 to review |
qiluo-msft
reviewed
Nov 7, 2020
| @@ -282,6 +302,7 @@ void VlanMgr::doVlanTask(Consumer &consumer) | |||
| if (isVlanStateOk(key) && m_vlans.find(key) == m_vlans.end()) | |||
| { | |||
| m_vlans.insert(key); | |||
| m_vlanReplay.erase(kfvKey(t)); | |||
There was a problem hiding this comment.
kfvKey(t) [](start = 35, length = 9)
erase #Closedit directly?
There was a problem hiding this comment.
@qiluo-msft sorry, I didn't understand, here I am erasing the key from the set m_vlanReplay, what do you mean by erase 'it' directly?
qiluo-msft
reviewed
Nov 7, 2020
| @@ -292,6 +313,7 @@ void VlanMgr::doVlanTask(Consumer &consumer) | |||
| { | |||
| addHostVlan(vlan_id); | |||
| } | |||
| m_vlanReplay.erase(kfvKey(t)); | |||
There was a problem hiding this comment.
kfvKey(t) [](start = 31, length = 9)
The same #Closed
qiluo-msft
reviewed
Nov 16, 2020
|
retest this please |
|
retest this please |
prsunny
reviewed
Nov 20, 2020
| WarmStart::isWarmStart()) | ||
| { | ||
| replayDone = true; | ||
| WarmStart::setWarmStartState("vlanmgrd", WarmStart::RECONCILED); |
There was a problem hiding this comment.
Why this change from REPLAYED?
There was a problem hiding this comment.
@prsunny test_VlanMgrdWarmRestart was failing as it expected the state to be RECONCILED. I understand now that as per HLD it is supposed to be REPLAYED. I will discuss with team members and check on how to handle this.
There was a problem hiding this comment.
@prsunny I will change the existing pytest script to match the EVPN HLD
There was a problem hiding this comment.
@prsunny I will change the existing pytest to expect REPLAYED instead of RECONCILED to match the EVPN HLD
Change back state to REPLAYED
prsunny
reviewed
Dec 9, 2020
tests/test_warm_reboot.py
Outdated
| @@ -437,7 +437,8 @@ def test_VlanMgrdWarmRestart(self, dvs, testlog): | |||
| (status, fvs) = tbl.get("Vlan20:11.0.0.11") | |||
| assert status == True | |||
|
|
|||
| swss_app_check_RestoreCount_single(state_db, restore_count, "vlanmgrd") | |||
| swss_check_RestoreCount(dvs, state_db, restore_count) | |||
There was a problem hiding this comment.
@qiluo-msft , could you review this?
There was a problem hiding this comment.
there are more dependencies on the Reconciled state in the vs tests, I will check and fix.
|
retest this please |
prsunny
approved these changes
Dec 27, 2020
EdenGri
pushed a commit
to EdenGri/sonic-swss
that referenced
this pull request
Feb 28, 2022
…eboot (sonic-net#1460) Check if any warm restart flag is set when issuing a warm-reboot. This check avoids starting a warm reboot while another warm restart is in progress. In the scenario where a warm reboot is issued with another warm restart in progress, the warm restart flag may be reset and part of the components have a risk of doing cold reboot.
EdenGri
pushed a commit
to EdenGri/sonic-swss
that referenced
this pull request
Feb 28, 2022
* mclagsyncd enhancements as per HLD at sonic-net/SONiC#596 * addressed LGTM alert * UT Fix unique IP configuration * modified ip address validate function for mclag config verication * Add soft-reboot reboot type (sonic-net#1453) What I did Add a new reboot named as soft-reboot which can be performed by "kexec -e" How I did it Replace the platform reboot with "kexec -e" for the cold reboot case. How to verify it Verified the reboot on DUT and check the reboot-cause * [warm-reboot] Check if warm restart flag is set when issuing a warm-reboot (sonic-net#1460) Check if any warm restart flag is set when issuing a warm-reboot. This check avoids starting a warm reboot while another warm restart is in progress. In the scenario where a warm reboot is issued with another warm restart in progress, the warm restart flag may be reset and part of the components have a risk of doing cold reboot. * Added mclag config commands * removed unwanted imports * added mclag tests * fixed build issue * corrected mclag test * corrected mclag test * corrected mclag test case * updated testcase for mclag * updated mclag config * updated mclag test cases * updated mclag test case * updated mclag test cases * fixed alert * updated mclag test cases * updated mclag test cases * updated mclag config * modified mclag test cases * updated mclag test case * updated mclag test case * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test case * updated mclag test case * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test case * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test cases * updated mclag test case * updated mclag test cases * updated mclag test case * updated mclag config to use swsscommon instead of swssdk * updated mclag config to use swsscommon * updated mclag config script file * fixed mclag test cases to verify config db * updated mclag test case with config db verify function * fixed build issue * updated test case * updated mclag test case * addressed review comments Co-authored-by: Tapash Das <[email protected]> Co-authored-by: Tapash Das <[email protected]> Co-authored-by: Sujin Kang <[email protected]> Co-authored-by: Shi Su <[email protected]>
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.
This PR is for vlanmgr changes related to EVPN VxLan warmboot.
Please refer to the HLD of EVPN VxLan for details.
sonic-net/SONiC#437