This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
forked from moby/moby
-
Notifications
You must be signed in to change notification settings - Fork 423
[18.09 backport] projectquota: protect concurrent map access (ENGCORE-920) #311
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 186cd7c) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 230a55d) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit cf104d8) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Was this updated with the last version? https://jenkins.dockerproject.org/job/Docker-PRs/55137/console
Looks like it's cherry-picking moby@b845a74 instead of moby@1ac0a66 |
thaJeztah
suggested changes
Aug 2, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not LGTM (see comment)
Protect access to q.quotas map, and lock around changing nextProjectID. Techinically, the lock in findNextProjectID() is not needed as it is only called during initialization, but one can never be too careful. Fixes: 52897d1 ("projectquota: utility class for project quota controls") Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 1ac0a66) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
5c9a352
to
7027bb9
Compare
fixed to switch to last version of upstream commit |
Janky failure should not be related https://jenkins.dockerproject.org/job/Docker-PRs/55220/console
|
is moby#38521 |
thaJeztah
approved these changes
Aug 7, 2019
There was a problem hiding this 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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a backport of
to address
Clean cherry-pick, no issues (moby#39327 is required solely for a clean cherry-pick)