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

grpclb: fix deadlock in grpclb connection cache #3017

Merged
merged 1 commit into from
Sep 10, 2019
Merged

grpclb: fix deadlock in grpclb connection cache #3017

merged 1 commit into from
Sep 10, 2019

Conversation

menghanl
Copy link
Contributor

Before the fix, if the timer to remove a SubConn fires at the same time
NewSubConn cancels the timer, it caused a mutex leak and deadlock.

@menghanl
grpclb: fix deadlock in grpclb connection cache
5f7c2df 
Before the fix, if the timer to remove a SubConn fires at the same time
NewSubConn cancels the timer, it caused a mutex leak and deadlock.
@menghanl menghanl added this to the 1.24 Release milestone Sep 10, 2019
@menghanl menghanl merged commit ac35b67 into grpc:master Sep 10, 2019
@menghanl menghanl deleted the grpclb_mutex_deadlock branch September 10, 2019 19:40
easwars pushed a commit that referenced this pull request Sep 11, 2019
@menghanl @easwars
grpclb: fix deadlock in grpclb connection cache (#3017)
ec76c9a 
Before the fix, if the timer to remove a SubConn fires at the same time
NewSubConn cancels the timer, it caused a mutex leak and deadlock.
easwars pushed a commit that referenced this pull request Sep 11, 2019
@menghanl @easwars
grpclb: fix deadlock in grpclb connection cache (#3017)
8cb6bac 
Before the fix, if the timer to remove a SubConn fires at the same time
NewSubConn cancels the timer, it caused a mutex leak and deadlock.
@thaJeztah thaJeztah mentioned this pull request Oct 20, 2019
Merged
@thaJeztah thaJeztah mentioned this pull request Oct 20, 2019
Merged
thaJeztah added a commit to thaJeztah/containerd that referenced this pull request Oct 21, 2019
@thaJeztah
bump google.golang.org/grpc v1.23.1
885232b 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Oct 21, 2019
@thaJeztah
bump google.golang.org/grpc v1.23.1
39ad39d 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Dec 13, 2019
@thaJeztah
bump google.golang.org/grpc v1.23.1
51dc8b2 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 39ad39d22020a06f25b06ca45d252f7d822485e8
Component: engine
thaJeztah added a commit to thaJeztah/cli that referenced this pull request Jan 7, 2020
@thaJeztah
vendor: bump google.golang.org/grpc v1.23.1
013151f 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Jan 7, 2020
Merged
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Jan 9, 2020
@thaJeztah
vendor: bump google.golang.org/grpc v1.23.1
7eb3e5e 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 013151ff786b0391ecbf5a6b0fbe68d3d0b0ded1
Component: cli
thaJeztah added a commit to thaJeztah/containerd that referenced this pull request Jan 31, 2020
@thaJeztah
bump google.golang.org/grpc v1.23.1
520c8cb 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 885232b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Jan 31, 2020
Merged
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Feb 22, 2020
@thaJeztah
bump google.golang.org/grpc v1.23.1
ce1b8c8 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 39ad39d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah mentioned this pull request Feb 22, 2020
Merged
tiborvass pushed a commit to tiborvass/cli that referenced this pull request Mar 3, 2020
@thaJeztah
vendor: bump google.golang.org/grpc v1.23.1
0e40b91 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 013151f)
Signed-off-by: Tibor Vass <tibor@docker.com>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Mar 3, 2020
@thaJeztah
vendor: bump google.golang.org/grpc v1.23.1
2887460 
full diff: grpc/grpc-go@v1.23.0...v1.23.1

- grpc/grpc-go#3018 server: set and advertise max frame size of 16KB
- grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache
    - Before the fix, if the timer to remove a SubConn fires at the
      same time NewSubConn cancels the timer, it caused a mutex leak
      and deadlock.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 013151ff786b0391ecbf5a6b0fbe68d3d0b0ded1)
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0e40b91921fe721f70afdaf89f55d8ab52684714
Component: cli
@lock lock bot locked as resolved and limited conversation to collaborators Mar 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dfawley dfawley dfawley approved these changes

Assignees

@dfawley dfawley

Labels
Type: Bug
Projects
None yet
Milestone
1.24 Release
Development

Successfully merging this pull request may close these issues.
3 participants
@menghanl @dfawley @easwars