(maint) Improve reboot code #1659
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
Before this change, the 'who -b' command was resilient when run before the reboot Now making it retry too if it cannot find the /boot/ line after a reboot too. We have seen one instance of a sles-12 machine rebooting, and the first request for 'who -b' after the reboot failed the connection, which made the search for the line be nil, and returning a stack trace when trying to convert that into Time with a TypeError: no implicit conversion of nil into String. Now protects against that and will retry as expected.
sbeaulie
commented
Jun 11, 2020
| @@ -50,7 +50,11 @@ def reboot(wait_time=10, max_connection_tries=9, uptime_retries=18) | |||
| sleep wait_time | |||
|
|
|||
| current_boot_time_str = exec(Beaker::Command.new('who -b'), {:max_connection_tries => max_connection_tries, :silent => true}).stdout | |||
| current_boot_time = Time.parse(current_boot_time_str.lines.grep(/boot/).first) | |||
There was a problem hiding this comment.
we already do this for the pre-reboot code here https://github.com/puppetlabs/beaker/blob/b0978887b7efd575af9292540153d7747d12df69/lib/beaker/host/unix/exec.rb#L23-L27
There was a problem hiding this comment.
👍 It should probably be abstracted into a method but this is fine for now.
highb
approved these changes
Jun 11, 2020
| @@ -50,7 +50,11 @@ def reboot(wait_time=10, max_connection_tries=9, uptime_retries=18) | |||
| sleep wait_time | |||
|
|
|||
| current_boot_time_str = exec(Beaker::Command.new('who -b'), {:max_connection_tries => max_connection_tries, :silent => true}).stdout | |||
| current_boot_time = Time.parse(current_boot_time_str.lines.grep(/boot/).first) | |||
There was a problem hiding this comment.
👍 It should probably be abstracted into a method but this is fine for now.
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.
Before this change, the 'who -b' command was resilient when run before the reboot
Now making it retry too if it cannot find the /boot/ line after a reboot too.
We have seen one instance of a sles-12 machine rebooting, and the first request
for 'who -b' after the reboot failed the connection, which made the search for the line
be nil, and returning a stack trace when trying to convert that into Time with a
TypeError: no implicit conversion of nil into String. Now protects against that
and will retry as expected.