Page MenuHomePhabricator
Differential D2808

Merge #11904: Add a lock to the wallet directory
ClosedPublic
Actions

Authored by jasonbcox on Apr 16 2019, 20:04.

Details

Reviewers
deadalnix
Fabien
Group Reviewers
Restricted Project
Commits
rSTAGING797636646c7c: Merge #11904: Add a lock to the wallet directory
rABC797636646c7c: Merge #11904: Add a lock to the wallet directory
Summary

2f3bd47 Abstract directory locking into util.cpp (MeshCollider)
5260a4a Make .walletlock distinct from .lock (MeshCollider)
64226de Generalise walletdir lock error message for correctness (MeshCollider)
c9ed4bd Add a test for wallet directory locking (MeshCollider)
e60cb99 Add a lock to the wallet directory (MeshCollider)

Pull request description:

Fixes https://github.com/bitcoin/bitcoin/issues/11888, needs a 0.16 milestone

Also adds a test that the lock works.

https://github.com/bitcoin/bitcoin/pull/11687 will probably rework this to a per-wallet lock instead of just the walletdir, but this fixes the current issue

Tree-SHA512: 98e52d67f820e3b8f919cf361ffbb7d928f1bd67603e0ed26c5076ea02d9b3a90c3535ddf7329f3b88171396fa28dd3c87adab3577a8a217bd1e4247bda99138

Backport of Core PR 11904
https://github.com/bitcoin/bitcoin/pull/11904/files
Completes T604
Depends on D2807

Test Plan

make check
test_runner.py wallet_multiwallet

Diff Detail

Repository
rABC Bitcoin ABC
Branch
pr11904
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 5469
Build 9000: Bitcoin ABC Buildbot (legacy)
Build 8999: arc lint + arc unit

Event Timeline

jasonbcox created this revision.Apr 16 2019, 20:04
Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 16 2019, 20:04
jasonbcox updated this revision to Diff 8079.Apr 16 2019, 20:05

Fixed brackets

teamcity added a comment.Apr 16 2019, 20:05

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

jasonbcox edited the summary of this revision. (Show Details)Apr 16 2019, 20:06
jasonbcox added a parent revision: D2807: [wallet] Close DB on error..
teamcity added a comment.Apr 16 2019, 20:06

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Apr 16 2019, 20:19

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B5469: Diff 8078.Apr 16 2019, 20:20
teamcity added a comment.Apr 16 2019, 20:20

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B5470: Diff 8079.Apr 16 2019, 20:20
jasonbcox added a child revision: D2809: Merge #12422: util: Make LockDirectory thread-safe, consistent.Apr 16 2019, 20:28
deadalnix accepted this revision.Apr 16 2019, 22:56
This revision is now accepted and ready to land.Apr 16 2019, 22:56
Closed by commit rABC797636646c7c: Merge #11904: Add a lock to the wallet directory (authored by Wladimir J. van der Laan <laanwj@gmail.com>, committed by jasonbcox). · Explain WhyApr 17 2019, 00:13
This revision was automatically updated to reflect the committed changes.
jasonbcox added a commit: rSTAGING797636646c7c: Merge #11904: Add a lock to the wallet directory.Sep 18 2019, 22:59

Revision Contents
Changeset List

PathSize
src/
29 lines
2 lines
26 lines
wallet/
2 lines
63 lines
test/
functional/
20 lines

Diff 8078

View Options

src/init.cpp

Loading...
View Options

src/util.h

Loading...
View Options

src/util.cpp

Loading...
View Options

src/wallet/db.h

Loading...
View Options

src/wallet/db.cpp

Loading...
View Options

test/functional/wallet_multiwallet.py

Loading...