cmd/containerd: use golang.org/x/sys Service.SetRecoveryActions()#7512
Merged
estesp merged 1 commit intocontainerd:mainfrom Oct 12, 2022
Merged
cmd/containerd: use golang.org/x/sys Service.SetRecoveryActions()#7512estesp merged 1 commit intocontainerd:mainfrom
estesp merged 1 commit intocontainerd:mainfrom
Conversation
Member
Author
kevpar
reviewed
Oct 12, 2022
| serviceConfigFailureActions = 2 | ||
| return s.SetRecoveryActions( | ||
| []mgr.RecoveryAction{ | ||
| {Type: mgr.ServiceRestart, Delay: 15 * time.Second / time.Millisecond}, |
Member
There was a problem hiding this comment.
Delay is a time.Duration, and gets converted to milliseconds by SetRecoveryActions, so we should just pass 15*time.Second here.
Member
Author
There was a problem hiding this comment.
Ooof! Good catch 😬 🤦♂️ It crossed my mind, but then went off to check "Did we change this timeout? " (to go and find cee19d1).
Either way; fixed it, thanks!
This is the equivalent of the local implementation. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
use_SetRecoveryActions
branch
from
6430418 to
634bf0d
Compare
Contributor
|
Late, but LGTM |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Looks like this is the equivalent of the local implementation.