10000 [19.03] backport projectquota: protect concurrent map access (ENGCORE-920) by kolyshkin · Pull Request #310 · docker-archive/engine · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03] backport projectquota: protect concurrent map access (ENGCORE-920) #310

Merged
merged 4 commits into from
Aug 7, 2019
Merged

[19.03] backport projectquota: protect concurrent map access (ENGCORE-920) #310

merged 4 commits into from
Aug 7, 2019

Conversation

kolyshkin
Copy link
@kolyshkin kolyshkin commented Aug 1, 2019 •
edited by thaJeztah
Loading

This is a backport of

to address

Clean cherry-pick, no issues (moby#39327 is required solely for a clean cherry-pick)

@tonistiigi @kolyshkin
quota: add noncgo build tag
56ff8cc 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 186cd7c)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@tonistiigi @kolyshkin
copy: allow non-cgo build
4ef8f6d 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 230a55d)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@tonistiigi @kolyshkin
stats: avoid cgo in collector
80e2871 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit cf104d8)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin added this to the 19.03.2 milestone Aug 1, 2019
@thaJeztah
Copy link
Member

Looks like this wasn't updated with the latest version: https://jenkins.dockerproject.org/job/Docker-PRs/55136/console

22:27:54 fatal error: sync: Unlock of unlocked RWMutex
22:27:54 
22:27:54 goroutine 12 [running]:

Looks like it's cherry-picking moby@b845a74 instead of moby@1ac0a66

thaJeztah
thaJeztah suggested changes Aug 2, 2019
View reviewed changes
Copy link
Member
@thaJeztah thaJeztah left a 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)

@kolyshkin
projectquota: protect concurrent map access
b0f01be 
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>
@kolyshkin
Copy link
Author

fixed to cherry-pick the latest version

@kolyshkin
Copy link
Author

restarted CI

thaJeztah
thaJeztah approved these changes Aug 7, 2019
View reviewed changes
Copy link
Member
@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

andrewhsu
andrewhsu approved these changes Aug 7, 2019
View reviewed changes
Copy link
@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 6b7330d into docker-archive:19.03 Aug 7, 2019
@cpuguy83 cpuguy83 mentioned this pull request Oct 7, 2019
Closed
3 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
2 more reviewers

@andrewhsu andrewhsu andrewhsu approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
19.03.2
Development

Successfully merging this pull request may close these issues.
4 participants
@kolyshkin @thaJeztah @andrewhsu @tonistiigi
0