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.

Sign up for GitHub

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

Jump to bottom

[release/1.6] Fix fatal map concurrency error in httpstream #11319

Merged
merged 1 commit into from
Mar 6, 2025
Merged

[release/1.6] Fix fatal map concurrency error in httpstream #11319

merged 1 commit into from
Mar 6, 2025
+1 −1

Conversation

ningmingxiao
Copy link
Contributor

@ningmingxiao ningmingxiao commented Jan 28, 2025 •
edited
Loading

cherry picked from commit 0fe9f0b

@k8s-ci-robot
Copy link

Hi @ningmingxiao. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@dosubot dosubot bot added area/cri Container Runtime Interface (CRI) kind/bug labels Jan 28, 2025
@ningmingxiao
Copy link
Contributor Author

since this pr is merged #11306 in 1.7.x
can this be cherrypick to 1.6.x @akhilerm @fuweid

@fuweid fuweid changed the title fix fatal error: concurrent map iteration and map write [release/1.6] fix fatal error: concurrent map iteration and map write Feb 5, 2025
@ningmingxiao
Copy link
Contributor Author

/retest

@ningmingxiao
fix fatal error: concurrent map iteration and map write
abd1692 
Signed-off-by: ningmingxiao <[email protected]>
(cherry picked from commit 0fe9f0b)
Signed-off-by: ningmingxiao <[email protected]>
@ningmingxiao
Copy link
Contributor Author

ningmingxiao commented Feb 8, 2025 •
edited
Loading

/retest

3 similar comments
@ningmingxiao
Copy link
Contributor Author

/retest

@ningmingxiao
Copy link
Contributor Author

/retest

@ningmingxiao
Copy link
Contributor Author

/retest

@ningmingxiao
Copy link
Contributor Author

@akhilerm can this pr be merged

@ningmingxiao ningmingxiao mentioned this pull request Mar 1, 2025
Closed
djdongjin
djdongjin approved these changes Mar 1, 2025
View reviewed changes
Copy link
Member

@djdongjin djdongjin left a comment

Choose a reason for hiding this comment

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

LGTM

@mxpv mxpv merged commit 72e69ed into containerd:release/1.6 Mar 6, 2025
49 checks passed
@ningmingxiao ningmingxiao deleted the 1.6_fix branch March 6, 2025 04:43
@dmcgowan dmcgowan changed the title [release/1.6] fix fatal error: concurrent map iteration and map write [release/1.6] Fix fatal map concurrency error in httpstream Mar 14, 2025
@dmcgowan dmcgowan mentioned this pull request Mar 14, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@mxpv mxpv mxpv approved these changes

@djdongjin djdongjin djdongjin approved these changes

Assignees
No one assigned
Labels
area/cri Container Runtime Interface (CRI) impact/changelog kind/bug ok-to-test size/XS
Projects
Pull Request Review
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ningmingxiao @k8s-ci-robot @cpuguy83 @mxpv @djdongjin @dmcgowan @fuweid