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

Fix shutdown hang with >= 8 -addnodes set (0.14 backport) #10013

Merged
merged 2 commits into from
Mar 18, 2017
Merged

Fix shutdown hang with >= 8 -addnodes set (0.14 backport) #10013

merged 2 commits into from
Mar 18, 2017

Conversation

TheBlueMatt
Copy link
Contributor

See #9953.

gmaxwell
gmaxwell approved these changes Mar 16, 2017
View reviewed changes
Copy link
Contributor

@gmaxwell gmaxwell left a comment

Choose a reason for hiding this comment

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

utACK (will test)

@fanquake fanquake added this to the 0.14.1 milestone Mar 17, 2017
@TheBlueMatt
Fix shutdown hang with >= 8 -addnodes set
d2548a4 
We previously would block waiting for a CSemaphoreGrant in
ThreadOpenAddedConnections, when we did not need to. This would
block as the posts in CConnman shutdown were both to the wrong
semaphore and in the wrong location.

Github-Pull: bitcoin#9953
Rebased-From: e007b24
@TheBlueMatt
Add missing braces in semaphore posts in net
4e2502b 
Github-Pull: bitcoin#9953
Rebased-From: 819b513
@TheBlueMatt
Copy link
Contributor Author

Added Github-Pull and Rebased-From metadata to commit messages.

@laanwj laanwj merged commit 4e2502b into bitcoin:0.14 Mar 18, 2017
laanwj added a commit that referenced this pull request Mar 18, 2017
@laanwj
Merge #10013: Fix shutdown hang with >= 8 -addnodes set (0.14 backport)
fa8c6dd 
4e2502b Add missing braces in semaphore posts in net (Matt Corallo)
d2548a4 Fix shutdown hang with >= 8 -addnodes set (Matt Corallo)

Tree-SHA512: 0b157793a2c7fabbc2ed24f974d206fc01c816189d6b6aa5a61bab562a0034f72b643a19b1e7920061e479fb27eddd4abf1c40e772a9573346b221a08e7e5ed9
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@gmaxwell gmaxwell gmaxwell approved these changes

Assignees
No one assigned
Labels
Backport P2P
Projects
None yet
Milestone
0.14.1
Development

Successfully merging this pull request may close these issues.
4 participants
@TheBlueMatt @gmaxwell @laanwj @fanquake