[release/1.7] Backport Sandbox/CRI fixes#8282
Merged
AkihiroSuda merged 3 commits intocontainerd:release/1.7from Mar 17, 2023
Merged
[release/1.7] Backport Sandbox/CRI fixes#8282AkihiroSuda merged 3 commits intocontainerd:release/1.7from
AkihiroSuda merged 3 commits intocontainerd:release/1.7from
Conversation
Member
dcantah
commented
Mar 16, 2023
dcantah
commented
- Sandbox: Cleanup shim on Start failure #8255
- Sandbox: Correct/add some fields to Status() #8257
- CRI: Don't always close netConfMonitor channel #8277
Made a change a bit ago to cleanup the shim on CreateSandbox failures and noted that we should probably do the same on Start as well as nothing gets cleaned up otherwise, and nothing states that a sandbox server/shim should exit itself if Create/Start fail. Ideally this could be hooked up to some subsystem in containerd that'd do it for us, but for now to allow developing prototyping sandbox shims this makes things much friendlier. Signed-off-by: Danny Canter <[email protected]> (cherry picked from commit 70da5c7) Signed-off-by: Danny Canter <[email protected]>
CreatedAt was being used as the ExitedAt timestamp, and Info from the response wasn't being set on the response. Signed-off-by: Danny Canter <[email protected]> (cherry picked from commit d835fd2) Signed-off-by: Danny Canter <[email protected]>
In the CRI server initialization a syncgroup is setup that adds to the counter for every cni config found/registered. This functions on platforms where CNI is supported/theres an assumption that there will always be the loopback config. However, on platforms like Darwin where there's generally nothing registered the Wait() on the syncgroup returns immediately and the channel used to return any Network config sync errors is closed. This channel is one of three that's used to monitor if we should Close the CRI service in containerd, so it's not great if this happens. Signed-off-by: Danny Canter <[email protected]> (cherry picked from commit 62f98a1) Signed-off-by: Danny Canter <[email protected]>
mxpv
approved these changes
Mar 16, 2023
AkihiroSuda
approved these changes
Mar 17, 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.