Skip to content

Conversation

@apostasie
Copy link
Contributor

As I am progressing through rewriting tests, the actual code issues are starting to show up more.
#3086 is definitely biting.

While we should consider rewriting CNIEnv on top of Store and ensure it is fully safe, this here will help a little bit in the interim.

Previous version had a lock, but somehow did enumerate the conf folder outside of it.

@apostasie apostasie force-pushed the bug-proactive-net-lock branch from 9432c6c to bd1eefa Compare October 3, 2024 18:27
@apostasie apostasie marked this pull request as ready for review October 3, 2024 21:06
@apostasie
Copy link
Contributor Author

Specifically, I have hopes that this might fix the spurious reading /etc/cni/net.d/XXXX.conflist: open /etc/cni/net.d/XXX.conflist: no such file or directory that we are seeing regularly.

@apostasie
Copy link
Contributor Author

@AkihiroSuda CI is green. This is ready.

Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@AkihiroSuda AkihiroSuda merged commit 251b95f into containerd:main Oct 4, 2024
22 checks passed
@AkihiroSuda AkihiroSuda added this to the v2.0.0 milestone Oct 4, 2024
@apostasie apostasie mentioned this pull request Oct 5, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants