Hardening lifecycle-state-store, name-store, and oci-hooks#3362
Merged
AkihiroSuda merged 3 commits intocontainerd:mainfrom Aug 29, 2024
Merged
Hardening lifecycle-state-store, name-store, and oci-hooks#3362AkihiroSuda merged 3 commits intocontainerd:mainfrom
AkihiroSuda merged 3 commits intocontainerd:mainfrom
Conversation
0d828c9 to
cf93ff9
Compare
89804a3 to
baf2e52
Compare
a51aca2 to
f31c4ff
Compare
Contributor
Author
|
Failure is the usual IPFS/compose. |
AkihiroSuda
reviewed
Aug 27, 2024
f31c4ff to
f48fac3
Compare
Contributor
Author
|
The Kube test (and underlying condition) is clearly racy. |
Contributor
Author
|
Grumble grumble. |
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
f48fac3 to
8e74cde
Compare
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
…rrored Signed-off-by: apostasie <spam_blackhole@farcloser.world>
8e74cde to
b954c7a
Compare
Contributor
Author
|
@AkihiroSuda CI is green. Mistake addressed. |
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
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.
First commit
Although #3350 got closed as a fluke, the error message seen in the logs clearly shows that the lifecycle state file could end-up messed-up, triggering a failure.
This does two things:
This will make the LifecycleState more robust and resistant to host shutdowns.
Note: we should consider a review of all our filesystem based stores and consider moving to atomic writing for them.
Second commit
Fix #3351 by making us resistant to the condition and allowing a container to acquire a "broken" name.
This obviously should never happen, but it does ^.
Third commit
Fix #3357 - does not fix the underlying issue, which is possibly upstream - but effectively mitigate it.
Since onPostStop is (wrongly?) called after an error in onCreateRuntime - while the container will NOT be deleted - we inhibit the normal cleanup flow in that case.