Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Conversation

@kolyshkin
Copy link

@kolyshkin kolyshkin commented Aug 1, 2019

This is a backport of

to address

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

Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit 186cd7c)
Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit 230a55d)
Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Tonis Tiigi <[email protected]>
(cherry picked from commit cf104d8)
Signed-off-by: Kir Kolyshkin <[email protected]>
@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

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)

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 <[email protected]>
(cherry picked from commit 1ac0a66)
Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin
Copy link
Author

fixed to cherry-pick the latest version

@kolyshkin
Copy link
Author

restarted CI

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

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants