vlanmgr changes related to EVPN VxLan warmboot#1460
vlanmgr changes related to EVPN VxLan warmboot#1460prsunny merged 9 commits intosonic-net:masterfrom anilkpan:master
Conversation
|
@heidinet2007 to review |
| 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?
| { | ||
| 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
left a comment
There was a problem hiding this comment.
It's look good to me. Not the domain expert, please check with others for review comments.
|
retest this please |
|
retest this please |
| 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
tests/test_warm_reboot.py
Outdated
| 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.
there are more dependencies on the Reconciled state in the vs tests, I will check and fix.
|
retest this please |
…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.
* 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]>
vlanmgr changes related to EVPN VxLan warmboot
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