Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.7] go.{mod,sum}: update NRI dependency, fixing a potential fd double close error. #9783

Merged

Conversation

klihub
Copy link
Member

@klihub klihub commented Feb 7, 2024

Update our NRI dependency. This fixes a potential fd double close bug (found and fixed by @champtar), occasionally seen in the wild when running with runtime-launched NRI plugins in place, and the node under high I/O load (for instance system boot).

This PR is a backport of #9743 to the release-1.7 branch.
Fixes #8860 in the release-1.7 branch.

@klihub
Copy link
Member Author

klihub commented Feb 7, 2024

@champtar Here is the backport of #9743 to release-1.7.

dmcgowan
dmcgowan previously approved these changes Feb 7, 2024
@dmcgowan
Copy link
Member

dmcgowan commented Feb 7, 2024

Run make vendor

@dmcgowan dmcgowan dismissed their stale review February 7, 2024 17:15

Needs vendor run

Pull in latest NRI fixing a potential fd double close error.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
@klihub klihub force-pushed the release/1.7/fixes/nri-fd-double-close branch from 6bb7e5c to d3e9975 Compare February 7, 2024 17:25
@klihub
Copy link
Member Author

klihub commented Feb 7, 2024

Run make vendor

Forgot to commit integration/client/go.{mod,sum}...

@klihub klihub requested a review from dmcgowan February 7, 2024 19:29
@fuweid fuweid merged commit 2d4823c into containerd:release/1.7 Feb 8, 2024
56 checks passed
@klihub klihub deleted the release/1.7/fixes/nri-fd-double-close branch February 8, 2024 05:01
@champtar
Copy link
Contributor

champtar commented Feb 8, 2024

Do we already have a timeframe for the next 1.7 release ?

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants