LLDP: Fix issue with restart_orchagent as VOQ does not support warm restarting of orchagent#16765
LLDP: Fix issue with restart_orchagent as VOQ does not support warm restarting of orchagent#16765arlakshm merged 2 commits intosonic-net:masterfrom
Conversation
…estarting of orchagent
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@abdosi, can help signoff on this change |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
After using kill orchagent and restart orchagent, it's found that orchagent is stopped finally and never come back up. Following are the error logs: |
|
@ZhaohuiS Can we have a discussion about #6560? I want to see how that works and what we found is that kill orchagent and restart orchagent is not working on our Nokia chassis which uses VOQ. Also want to check if restart the swss services instead could also be OK for the issue you try to test or not. |
|
@wumiaont I think it's fine, in your change, will restart swss for voq, but for other types of DUT, the behavior is same as before, right? |
Yes. That's correct. I only made changes for VOQ to restart swss instead. Other platform will still use the existing method to restart orchagent. |
ZhaohuiS
left a comment
There was a problem hiding this comment.
From your change, it will not impact other platforms.
|
@wumiaont, can you please create a PR for 202503 branch in the msft repo. |
OK. Will do. |
|
…estarting of orchagent (sonic-net#16765) (sonic-net#218) Description of PR test_lldp_neighbor_post_orchagent_reboot uses prefix restart_orchagent() to warm restart orchagent. This warm restart of orchagent(kill orchagent and restart orchagent process) is not supported on chassis with type VOQ. Add code to handle chassis type VOQ case by restarting the swss@0(1) service. This will cause ports to be removed from lldp table and add back in so we can test the issue found in sonic-net#6560. Summary: Fixes # (issue) Type of change Bug fix Testbed and Framework(new/improvement) New Test case Skipped for non-supported platforms Test case improvement Back port request 202012 202205 202305 202311 202405 202411 Approach What is the motivation for this PR? Currently test_lldp_neighbor_post_orchagent_reboot is failing against chassis with type VOQ. It's found warm restart of orchagent is not supported on VOQ type chassis. How did you do it? For VOQ type chassis, uses "systemctl restart swss@0(1)" instead. How did you verify/test it? After the fix the test passed consistently against VOQ type chassis. <!-- Please make sure you've read and understood our contributing guidelines; https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md Please provide following information to help code review process a bit easier: --> ### Description of PR <!-- - Please include a summary of the change and which issue is fixed. - Please also include relevant motivation and context. Where should reviewer start? background context? - List any dependencies that are required for this change. --> Summary: Fixes # (issue) ### Type of change <!-- - Fill x for your type of change. - e.g. - [x] Bug fix --> - [ ] Bug fix - [ ] Testbed and Framework(new/improvement) - [ ] Test case(new/improvement) ### Back port request - [ ] 202012 - [ ] 202205 - [ ] 202305 - [ ] 202311 - [ ] 202405 ### Approach #### What is the motivation for this PR? #### How did you do it? #### How did you verify/test it? #### Any platform specific information? #### Supported testbed topology if it's a new test case? ### Documentation <!-- (If it's a new feature, new test case) Did you update documentation/Wiki relevant to your implementation? Link to the wiki page? -->
…estarting of orchagent (sonic-net#16765) Description of PR test_lldp_neighbor_post_orchagent_reboot uses prefix restart_orchagent() to warm restart orchagent. This warm restart of orchagent(kill orchagent and restart orchagent process) is not supported on chassis with type VOQ. Add code to handle chassis type VOQ case by restarting the swss@0(1) service. This will cause ports to be removed from lldp table and add back in so we can test the issue found in sonic-net#6560. Summary: Fixes # (issue) Type of change Bug fix Testbed and Framework(new/improvement) New Test case Skipped for non-supported platforms Test case improvement Back port request 202012 202205 202305 202311 202405 202411 Approach What is the motivation for this PR? Currently test_lldp_neighbor_post_orchagent_reboot is failing against chassis with type VOQ. It's found warm restart of orchagent is not supported on VOQ type chassis. How did you do it? For VOQ type chassis, uses "systemctl restart swss@0(1)" instead. How did you verify/test it? After the fix the test passed consistently against VOQ type chassis. Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
…estarting of orchagent (sonic-net#16765) Description of PR test_lldp_neighbor_post_orchagent_reboot uses prefix restart_orchagent() to warm restart orchagent. This warm restart of orchagent(kill orchagent and restart orchagent process) is not supported on chassis with type VOQ. Add code to handle chassis type VOQ case by restarting the swss@0(1) service. This will cause ports to be removed from lldp table and add back in so we can test the issue found in sonic-net#6560. Summary: Fixes # (issue) Type of change Bug fix Testbed and Framework(new/improvement) New Test case Skipped for non-supported platforms Test case improvement Back port request 202012 202205 202305 202311 202405 202411 Approach What is the motivation for this PR? Currently test_lldp_neighbor_post_orchagent_reboot is failing against chassis with type VOQ. It's found warm restart of orchagent is not supported on VOQ type chassis. How did you do it? For VOQ type chassis, uses "systemctl restart swss@0(1)" instead. How did you verify/test it? After the fix the test passed consistently against VOQ type chassis. Signed-off-by: Aharon Malkin <amalkin@nvidia.com>
…estarting of orchagent (sonic-net#16765) Description of PR test_lldp_neighbor_post_orchagent_reboot uses prefix restart_orchagent() to warm restart orchagent. This warm restart of orchagent(kill orchagent and restart orchagent process) is not supported on chassis with type VOQ. Add code to handle chassis type VOQ case by restarting the swss@0(1) service. This will cause ports to be removed from lldp table and add back in so we can test the issue found in sonic-net#6560. Summary: Fixes # (issue) Type of change Bug fix Testbed and Framework(new/improvement) New Test case Skipped for non-supported platforms Test case improvement Back port request 202012 202205 202305 202311 202405 202411 Approach What is the motivation for this PR? Currently test_lldp_neighbor_post_orchagent_reboot is failing against chassis with type VOQ. It's found warm restart of orchagent is not supported on VOQ type chassis. How did you do it? For VOQ type chassis, uses "systemctl restart swss@0(1)" instead. How did you verify/test it? After the fix the test passed consistently against VOQ type chassis. Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
…estarting of orchagent (sonic-net#16765) Description of PR test_lldp_neighbor_post_orchagent_reboot uses prefix restart_orchagent() to warm restart orchagent. This warm restart of orchagent(kill orchagent and restart orchagent process) is not supported on chassis with type VOQ. Add code to handle chassis type VOQ case by restarting the swss@0(1) service. This will cause ports to be removed from lldp table and add back in so we can test the issue found in sonic-net#6560. Summary: Fixes # (issue) Type of change Bug fix Testbed and Framework(new/improvement) New Test case Skipped for non-supported platforms Test case improvement Back port request 202012 202205 202305 202311 202405 202411 Approach What is the motivation for this PR? Currently test_lldp_neighbor_post_orchagent_reboot is failing against chassis with type VOQ. It's found warm restart of orchagent is not supported on VOQ type chassis. How did you do it? For VOQ type chassis, uses "systemctl restart swss@0(1)" instead. How did you verify/test it? After the fix the test passed consistently against VOQ type chassis. Signed-off-by: Guy Shemesh <gshemesh@nvidia.com>
Description of PR
test_lldp_neighbor_post_orchagent_reboot uses prefix restart_orchagent() to warm restart orchagent. This warm restart of orchagent(kill orchagent and restart orchagent process) is not supported on chassis with type VOQ.
Add code to handle chassis type VOQ case by restarting the swss@0(1) service. This will cause ports to be removed from lldp table and add back in so we can test the issue found in #6560.
Summary:
Fixes # (issue)
Type of change
Back port request
Approach
What is the motivation for this PR?
Currently test_lldp_neighbor_post_orchagent_reboot is failing against chassis with type VOQ. It's found warm restart of orchagent is not supported on VOQ type chassis.
How did you do it?
For VOQ type chassis, uses "systemctl restart swss@0(1)" instead.
How did you verify/test it?
After the fix the test passed consistently against VOQ type chassis.