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.

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

GRPC: fix deadlock in removeChannel #3301

Merged
merged 1 commit into from Jan 12, 2018

Conversation

@Johni0702
Copy link
Contributor

commented Jan 12, 2018

Server::removeChannel already acquires the voice thread lock where necessary, doing so before calling it will result in a dead lock.

GRPC: fix deadlock in removeChannel
Server::removeChannel already acquires the voice threads lock where
necessary, doing so before calling it will result in a dead lock.

@davidebeatrici davidebeatrici requested a review from mkrautz Jan 12, 2018

@mkrautz

This comment has been minimized.

Copy link
Member

commented Jan 12, 2018

Hmmm. Not sure I agree that Server::removeChannel takes qrwlVoiceThread when necessary. It doesn't seem to hold that lock at all?

@Johni0702

This comment has been minimized.

Copy link
Contributor Author

commented Jan 12, 2018

Here, here and here.

@mkrautz

This comment has been minimized.

Copy link
Member

commented Jan 12, 2018

Well there you go. :-)

I was, foolishly, looking at Server::removeChannelDB() instead. Thanks for pointing them out to me.

@mkrautz mkrautz merged commit 1844f21 into mumble-voip:master Jan 12, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.