Skip to content

cri: emit warning for concurrent CreateContainer#12695

Merged
mikebrow merged 1 commit intocontainerd:mainfrom
samuelkarp:concurrent-create-container
Dec 23, 2025
Merged

cri: emit warning for concurrent CreateContainer#12695
mikebrow merged 1 commit intocontainerd:mainfrom
samuelkarp:concurrent-create-container

Conversation

@samuelkarp
Copy link
Copy Markdown
Member

@samuelkarp samuelkarp commented Dec 16, 2025

We have existing detection for concurrent CreateContainer requests, but the error message is unclear and there is no warning in containerd logs. This change adds a warning and clarifies the error message.

@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Dec 16, 2025
@dosubot dosubot Bot added area/cri Container Runtime Interface (CRI) kind/feature labels Dec 16, 2025
chrishenzie
chrishenzie approved these changes Dec 16, 2025
View reviewed changes
Comment thread internal/cri/server/container_create.go
dmcgowan
dmcgowan reviewed Dec 17, 2025
View reviewed changes
Comment thread internal/registrar/registrar.go
@samuelkarp
cri: emit warning for concurrent CreateContainer
c94b423 
We have existing detection for concurrent CreateContainer requests, but
the error message is unclear and there is no warning in containerd logs.
This change adds a warning and clarifies the error message.

Signed-off-by: Samuel Karp <[email protected]>
@samuelkarp samuelkarp force-pushed the concurrent-create-container branch from 2129d74 to c94b423 Compare December 17, 2025 00:47
mikebrow
mikebrow approved these changes Dec 17, 2025
View reviewed changes
Copy link
Copy Markdown
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

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Dec 17, 2025
mikebrow
mikebrow reviewed Dec 17, 2025
View reviewed changes
Comment thread internal/cri/server/container_create.go
@mikebrow mikebrow added this pull request to the merge queue Dec 23, 2025
Merged via the queue into containerd:main with commit 1e154a8 Dec 23, 2025
114 of 132 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Dec 23, 2025
@samuelkarp samuelkarp added cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 23, 2025
@samuelkarp
Copy link
Copy Markdown
Member Author

samuelkarp commented Dec 23, 2025

/cherry-pick release/2.2
/cherry-pick release/2.1
/cherry-pick release/1.7

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

k8s-infra-cherrypick-robot commented Dec 23, 2025

@samuelkarp: #12695 failed to apply on top of branch "release/1.7":

Applying: cri: emit warning for concurrent CreateContainer
Using index info to reconstruct a base tree...
A	internal/cri/server/container_create.go
A	internal/registrar/registrar.go
A	internal/registrar/registrar_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/cri/sbserver/container_create.go
CONFLICT (content): Merge conflict in pkg/cri/sbserver/container_create.go
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 cri: emit warning for concurrent CreateContainer
Details

In response to this:

/cherry-pick release/2.2
/cherry-pick release/2.1
/cherry-pick release/1.7

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
Copy link
Copy Markdown
Member Author

samuelkarp commented Dec 29, 2025

/cherry-pick release/2.2

@samuelkarp
Copy link
Copy Markdown
Member Author

samuelkarp commented Dec 29, 2025

/cherry-pick release/2.1

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

k8s-infra-cherrypick-robot commented Dec 29, 2025

@samuelkarp: new pull request created: #12735

Details

In response to this:

/cherry-pick release/2.2

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 29, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Dec 29, 2025

@samuelkarp: #12695 failed to apply on top of branch "release/2.1":

Applying: cri: emit warning for concurrent CreateContainer
Using index info to reconstruct a base tree...
M	internal/cri/server/container_create.go
Falling back to patching base and 3-way merge...
Auto-merging internal/cri/server/container_create.go
CONFLICT (content): Merge conflict in internal/cri/server/container_create.go
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 cri: emit warning for concurrent CreateContainer
Details

In response to this:

/cherry-pick release/2.1

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.

@fuweid fuweid added cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch and removed cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 30, 2025
@samuelkarp samuelkarp mentioned this pull request Jan 5, 2026
Merged
@samuelkarp samuelkarp mentioned this pull request Jan 5, 2026
Merged
@samuelkarp samuelkarp added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch labels Jan 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan left review comments

@mikebrow mikebrow mikebrow approved these changes

@chrishenzie chrishenzie chrishenzie approved these changes

Assignees

No one assigned

Labels

area/cri Container Runtime Interface (CRI) cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch size/M

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@samuelkarp @k8s-infra-cherrypick-robot @dmcgowan @chrishenzie @mikebrow @fuweid @k8s-ci-robot