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 potential deadlock in LoadWallet() #2806

Merged
merged 2 commits into from
Mar 25, 2019
Merged

Fix potential deadlock in LoadWallet() #2806

merged 2 commits into from
Mar 25, 2019

Conversation

UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Mar 25, 2019 

POTENTIAL DEADLOCK DETECTED
Previous lock order was:
 (1) cs_main  wallet/wallet.cpp:3881
 (2) cs_wallet  wallet/wallet.cpp:3881
Current lock order is:
 (2) pwallet->cs_wallet  wallet/walletdb.cpp:589
 (1) cs_main  wallet/wallet.cpp:1252

@UdjinM6
Fix potential deadlock in LoadWallet()
36cb150 
```
POTENTIAL DEADLOCK DETECTED
Previous lock order was:
 (1) cs_main  wallet/wallet.cpp:3881
 (2) cs_wallet  wallet/wallet.cpp:3881
Current lock order is:
 (2) pwallet->cs_wallet  wallet/walletdb.cpp:589
 (1) cs_main  wallet/wallet.cpp:1252
```
@UdjinM6 UdjinM6 added the bug label Mar 25, 2019
@UdjinM6 UdjinM6 added this to the 14.0 milestone Mar 25, 2019
@codablock
Copy link

@UdjinM6 This will later indirectly conflict with bitcoin#14437 (it removes the need to lock cs_main in wallet code). Can you add a comment to the LOCK line in CWallet::MarkConflicted so that it later merge-conflicts when we try to backport bitcoin#14437?

codablock
codablock approved these changes Mar 25, 2019
View reviewed changes
Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

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

utACK

@UdjinM6 UdjinM6 merged commit 162acc5 into dashpay:develop Mar 25, 2019
@UdjinM6 UdjinM6 deleted the fix_deadlock branch November 26, 2020 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codablock codablock codablock approved these changes

Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
14.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@UdjinM6 @codablock