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

[Wallet] Make nWalletDBUpdated atomic to avoid a potential race #1802

Merged
merged 2 commits into from
Aug 23, 2020
Merged

[Wallet] Make nWalletDBUpdated atomic to avoid a potential race #1802

merged 2 commits into from
Aug 23, 2020

Conversation

furszy
Copy link

@furszy furszy commented Aug 11, 2020

Quick back ports, coming from dashpay#5983 and bitcoin#9227.

@furszy furszy self-assigned this Aug 11, 2020
@furszy
Copy link
Author

furszy commented Aug 11, 2020 •
edited
Loading

Have included bitcoin#8564
Was going to push it in a separate PR but the changes are small enough to be here as well.

Edit: Removed it, it was causing some issues. Better to push it separately.

Fuzzbawls
Fuzzbawls reviewed Aug 12, 2020
View reviewed changes
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

Small nit, but otherwise looking good

src/wallet/walletdb.cpp Outdated Show resolved Hide resolved
@Fuzzbawls Fuzzbawls added this to the 5.0.0 milestone Aug 12, 2020
@furszy
Make nWalletDBUpdated atomic to avoid a potential race.
5069899 
coming from btc@d63ff6265b0c6ae30efcbb9120d4db419606198a
random-zebra
random-zebra approved these changes Aug 19, 2020
View reviewed changes
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

utACK 5069899

This will conflict with #1811, which removes the argument of ThreadFlushWalletDB. We can probably merge this one first, as it is easier.

Fuzzbawls
Fuzzbawls approved these changes Aug 23, 2020
View reviewed changes
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

utACK 5069899

@random-zebra random-zebra merged commit 7db7724 into PIVX-Project:master Aug 23, 2020
@random-zebra random-zebra modified the milestones: 5.0.0, 4.3.0 Sep 10, 2020
@lyricidal lyricidal mentioned this pull request Nov 21, 2022
Merged
@furszy furszy deleted the 2020_backport_9227 branch November 29, 2022 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fuzzbawls Fuzzbawls Fuzzbawls approved these changes

@random-zebra random-zebra random-zebra approved these changes

Assignees

@furszy furszy

Labels
None yet
Projects
None yet
Milestone
4.3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@furszy @Fuzzbawls @random-zebra