Skip to content

Fix go-cni race condition#11244

Merged
mxpv merged 1 commit intocontainerd:mainfrom
MikeZappa87:bug/fixgocniracecondition
Jan 10, 2025
Merged

Fix go-cni race condition#11244
mxpv merged 1 commit intocontainerd:mainfrom
MikeZappa87:bug/fixgocniracecondition

Conversation

@MikeZappa87
Copy link
Copy Markdown
Member

@MikeZappa87 MikeZappa87 commented Jan 9, 2025 •
edited
Loading

A race condition was found in go-cni and fixed in containerd/go-cni#126

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Jan 9, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@MikeZappa87
fix go-cni race condition
09bf281 
Signed-off-by: Michael Zappa <[email protected]>
@MikeZappa87 MikeZappa87 force-pushed the bug/fixgocniracecondition branch from f620414 to 09bf281 Compare January 10, 2025 00:07
@MikeZappa87 MikeZappa87 marked this pull request as ready for review January 10, 2025 00:10
@dosubot dosubot Bot added dependencies Pull requests that update a dependency file kind/bug labels Jan 10, 2025
@mxpv mxpv added this pull request to the merge queue Jan 10, 2025
Merged via the queue into containerd:main with commit 6162ab5 Jan 10, 2025
@mikebrow mikebrow added the cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch label Jan 15, 2025
@mikebrow mikebrow added this to the 2.1 milestone Jan 15, 2025
@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Jan 15, 2025

/cherry-pick release/2.0

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Jan 15, 2025

@mikebrow: #11244 failed to apply on top of branch "release/2.0":

Applying: fix go-cni race condition
.git/rebase-apply/patch:1409: trailing whitespace.
# Online deadlock detection in go (golang). [![Try it online](https://img.shields.io/badge/try%20it-online-blue.svg)](https://wandbox.org/permlink/hJc6QCZowxbNm9WW) [![Docs](https://godoc.org/github.com/sasha-s/go-deadlock?status.svg)](https://godoc.org/github.com/sasha-s/go-deadlock) [![Build Status](https://travis-ci.com/sasha-s/go-deadlock.svg?branch=master)](https://travis-ci.com/sasha-s/go-deadlock) [![codecov](https://codecov.io/gh/sasha-s/go-deadlock/branch/master/graph/badge.svg)](https://codecov.io/gh/sasha-s/go-deadlock) [![version](https://badge.fury.io/gh/sasha-s%2Fgo-deadlock.svg)](https://github.com/sasha-s/go-deadlock/releases)  [![Go Report Card](https://goreportcard.com/badge/github.com/sasha-s/go-deadlock)](https://goreportcard.com/report/github.com/sasha-s/go-deadlock) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) 
.git/rebase-apply/patch:1595: trailing whitespace.
	
.git/rebase-apply/patch:2178: trailing whitespace.
	}		
.git/rebase-apply/patch:622: new blank line at EOF.
+
.git/rebase-apply/patch:1594: new blank line at EOF.
+
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix go-cni race condition
Details

In response to this:

/cherry-pick release/2.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@djdongjin djdongjin mentioned this pull request Jan 17, 2025
Closed
@djdongjin
Copy link
Copy Markdown
Member

djdongjin commented Jan 21, 2025

/cherry-pick release/2.0

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Jan 21, 2025

@djdongjin: #11244 failed to apply on top of branch "release/2.0":

Applying: fix go-cni race condition
.git/rebase-apply/patch:1409: trailing whitespace.
# Online deadlock detection in go (golang). [![Try it online](https://img.shields.io/badge/try%20it-online-blue.svg)](https://wandbox.org/permlink/hJc6QCZowxbNm9WW) [![Docs](https://godoc.org/github.com/sasha-s/go-deadlock?status.svg)](https://godoc.org/github.com/sasha-s/go-deadlock) [![Build Status](https://travis-ci.com/sasha-s/go-deadlock.svg?branch=master)](https://travis-ci.com/sasha-s/go-deadlock) [![codecov](https://codecov.io/gh/sasha-s/go-deadlock/branch/master/graph/badge.svg)](https://codecov.io/gh/sasha-s/go-deadlock) [![version](https://badge.fury.io/gh/sasha-s%2Fgo-deadlock.svg)](https://github.com/sasha-s/go-deadlock/releases)  [![Go Report Card](https://goreportcard.com/badge/github.com/sasha-s/go-deadlock)](https://goreportcard.com/report/github.com/sasha-s/go-deadlock) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) 
.git/rebase-apply/patch:1595: trailing whitespace.
	
.git/rebase-apply/patch:2178: trailing whitespace.
	}		
.git/rebase-apply/patch:622: new blank line at EOF.
+
.git/rebase-apply/patch:1594: new blank line at EOF.
+
warning: 5 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix go-cni race condition
Details

In response to this:

/cherry-pick release/2.0

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@samuelkarp samuelkarp mentioned this pull request Jan 29, 2025
Merged
@chrishenzie chrishenzie added cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Apr 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys approved these changes

@mxpv mxpv mxpv approved these changes

Assignees

No one assigned

Labels

cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch dependencies Pull requests that update a dependency file kind/bug size/XXL

Projects

None yet

Milestone

2.1

Development

Successfully merging this pull request may close these issues.

8 participants

@MikeZappa87 @k8s-ci-robot @mikebrow @k8s-infra-cherrypick-robot @djdongjin @kzys @mxpv @chrishenzie