diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-07-22 08:58:50 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-07-22 08:58:55 +0200 |
| commit | c7007babb7c2a7ce903793788910255fb336b9de (patch) | |
| tree | 4c276b4e6911908e58860e341d8374e3bf24a00a /src/wallet/bdb.h | |
| parent | 2c0c3f8e8ca6c64234b1861583f55da2bb385446 (diff) | |
| parent | d0ea9bab2804928c9f40def61fd99064d2d8f9b8 (diff) | |
Merge #18907: walletdb: Don't remove database transaction logs and instead error
d0ea9bab2804928c9f40def61fd99064d2d8f9b8 walletdb: Don't remove database transaction logs and instead error (Andrew Chow)
Pull request description:
Instead of removing the database transaction logs and retrying the
wallet loading, just return an error message to the user. Additionally,
speciically for DB_RUNRECOVERY, notify the user that this could be due
to different BDB versions.
Kind of implements the suggestion from https://github.com/bitcoin/bitcoin/pull/18870#discussion_r421647964
ACKs for top commit:
Sjors:
re-utACK d0ea9bab2804928c9f40def61fd99064d2d8f9b8
ryanofsky:
Code review ACK d0ea9bab2804928c9f40def61fd99064d2d8f9b8. Only changes since last review are rebase and expanding error and commit messages.
Tree-SHA512: f6e67dc70f58188742a5c8af7cdc63a2b58779aa0d26ae7f1e75805a239f1a342433860e5a238d6577fae5ab04b9d15e7f11c55b867065dfd13781a6a62e4958
Diffstat (limited to 'src/wallet/bdb.h')
| -rw-r--r-- | src/wallet/bdb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/bdb.h b/src/wallet/bdb.h index e54776fc0d..1b9b5de9f9 100644 --- a/src/wallet/bdb.h +++ b/src/wallet/bdb.h @@ -69,7 +69,7 @@ public: bool Verify(const std::string& strFile); - bool Open(bool retry); + bool Open(bilingual_str& error); void Close(); void Flush(bool fShutdown); void CheckpointLSN(const std::string& strFile); |