[release/1.7] Require plugins to succeed after registering readiness#9165
Merged
fuweid merged 2 commits intocontainerd:release/1.7from Sep 30, 2023
Merged
Conversation
Member
|
Could you swap the commit order to help bisecting? |
`NewCRIService()` may easily fail and its error has to be ignored unless the CRI plugin is in the `required_plugins` list. Now this has to be called before `RegisterReadiness()`, as PR 9153 "Require plugins to succeed after registering readiness" was merged on 2023-09-29. Fix issue 9163: `[Regression in main (2023-09-29)]: containerd-rootless.sh doesn't start up` Signed-off-by: Akihiro Suda <[email protected]> (cherry picked from commit 5365f4b) Signed-off-by: Derek McGowan <[email protected]>
When readiness is registered on initialization, the plugin must not fail. When such a plugin fails, containerd will hang on the readiness condition. Signed-off-by: Derek McGowan <[email protected]> (cherry picked from commit e725440) Signed-off-by: Derek McGowan <[email protected]>
dmcgowan
force-pushed
the
backport-1.7-readiness-hang-fix
branch
from
b8c0638 to
a83c668
Compare
AkihiroSuda
approved these changes
Sep 30, 2023
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
3 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.
Fixes hang when plugin which registers readiness fail. Additional fix in CRI to register readiness later on in its initialization.
Backport #9153 #9164