Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[202405]Enhance advance reboot test (#15880) #16160

Merged
merged 1 commit into from
Feb 10, 2025

Conversation

nhe-NV
Copy link
Contributor

@nhe-NV nhe-NV commented Dec 19, 2024

  • Add more debug information to the advance reboot
  1. Add more debug information
  2. When get the dut time has exception, need to not break the get teamd state function
  3. When get the finalizer_state, if the state is set to empty should not return.

Description of PR

Summary:
Fixes # (issue)
cherry-pick for #1588

Type of change

  • 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

* Add more debug information to the advance reboot

1. Add more debug information
2. When get the dut time has exception, need to not break the get teamd state function
3. When get the finalizer_state, if the state is set to empty should not return.

Change-Id: Ifb87ca9a5c7321cc632e100b8ceda759fa0ea804
@mssonicbld
Copy link
Collaborator

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@nhe-NV nhe-NV changed the title Enhance advance reboot test (#15880) [202405]Enhance advance reboot test (#15880) Dec 19, 2024
@nhe-NV nhe-NV mentioned this pull request Dec 19, 2024
8 tasks
@@ -1457,14 +1467,24 @@ def wait_until_teamd_goes_down(self):

while teamd_state == 'active':
time.sleep(1)
dut_datetime_during_shutdown = self.get_now_time()
try:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would be better to define a new function - run_and_ignore_failure, as you use it more than once

@@ -1003,8 +1003,14 @@ def check_warmboot_finalizer(self, finalizer_timeout):
self.finalizer_state = self.get_warmboot_finalizer_state()
self.log('warmboot finalizer service state {}'.format(self.finalizer_state))
count = 0
while self.finalizer_state == 'activating':
self.finalizer_state = self.get_warmboot_finalizer_state()
while self.finalizer_state != 'inactive':
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we change the logic from ==activating to !=inactive ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why do we change the logic from ==activating to !=inactive ?

The is some chance that self.get_warmboot_finalizer_state() will return "" if the it some problem to access the dut

@nhe-NV
Copy link
Contributor Author

nhe-NV commented Feb 8, 2025

@bingwang-ms Can you help to merge this? this is to handle the confilict in 202405 for PR #15880 which was already merged

@bingwang-ms bingwang-ms merged commit 80667a0 into sonic-net:202405 Feb 10, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants