wallet: Unify wallet directory lock error message by hebasto · Pull Request #20094 · bitcoin/bitcoin

hebasto · 2020-10-06T17:52:31Z

On master (875e1cc) a redundant log message is printed, and it uses "bitcoin" instead of PACKAGE_NAME:

2020-10-06T17:36:44Z Using wallet directory /home/hebasto/walletdir
2020-10-06T17:36:44Z init message: Verifying wallet(s)...
2020-10-06T17:36:44Z Using BerkeleyDB version Berkeley DB 5.3.28: (September  9, 2013)
2020-10-06T17:36:44Z Using wallet /home/hebasto/walletdir/wr-201006/wallet.dat
2020-10-06T17:36:44Z ERROR: Error while attempting to lock directory /home/hebasto/walletdir/wr-201006: Resource temporarily unavailable
2020-10-06T17:36:44Z Cannot obtain a lock on wallet directory /home/hebasto/walletdir/wr-201006. Another instance of bitcoin may be using it.
2020-10-06T17:36:44Z Error: Error initializing wallet database environment "/home/hebasto/walletdir/wr-201006"!
Error: Error initializing wallet database environment "/home/hebasto/walletdir/wr-201006"!
2020-10-06T17:36:44Z Shutdown: In progress...
2020-10-06T17:36:44Z scheduler thread exit
2020-10-06T17:36:44Z Shutdown: done

This PR removes redundant LogPrintf call, and unifies error message wording with the similar datadir lock error message:

2020-10-06T17:34:21Z Using wallet directory /home/hebasto/walletdir
2020-10-06T17:34:21Z init message: Verifying wallet(s)...
2020-10-06T17:34:21Z Using BerkeleyDB version Berkeley DB 5.3.28: (September  9, 2013)
2020-10-06T17:34:21Z Using wallet /home/hebasto/walletdir/wr-201006/wallet.dat
2020-10-06T17:34:21Z ERROR: Error while attempting to lock directory /home/hebasto/walletdir/wr-201006: Resource temporarily unavailable
2020-10-06T17:34:21Z Error: Cannot obtain a lock on wallet directory /home/hebasto/walletdir/wr-201006. Bitcoin Core is probably already running.
Error: Cannot obtain a lock on wallet directory /home/hebasto/walletdir/wr-201006. Bitcoin Core is probably already running.
2020-10-06T17:34:21Z Shutdown: In progress...
2020-10-06T17:34:21Z scheduler thread exit
2020-10-06T17:34:21Z Shutdown: done

maflcko · 2020-10-07T07:06:02Z

Concept ACK. Though, this changes a translation string.

maflcko · 2020-10-07T08:30:16Z

test/functional/wallet_multiwallet.py

-        exp_stderr = r"Error: Error initializing wallet database environment \"\S+competing_walletdir\"!"
-        self.nodes[1].assert_start_raises_init_error(['-walletdir=' + competing_wallet_dir], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
+        exp_stderr = "Error: Cannot obtain a lock on wallet directory {0}. {1} is probably already running.".format(competing_wallet_dir, self.config['environment']['PACKAGE_NAME'])
+        self.nodes[1].assert_start_raises_init_error(['-walletdir=' + competing_wallet_dir], exp_stderr)


Would also be good to temporarily enable the functional tests on appveyor again to see if the full path works on windows as well

Done: https://ci.appveyor.com/project/DrahtBot/bitcoin/builds/35614117

AssertionError: [node 1] Expected message "Error: Cannot obtain a lock on wallet directory C:\Users\appveyor\AppData\Local\Temp\1\test_runner_₿_🏃_20201007_132949\wallet_multiwallet_117\competing_walletdir. Bitcoin Core is probably already running." does not fully match stderr: "Error: Cannot obtain a lock on wallet directory C:/Users\appveyor\AppData\Local\Temp\1\test_runner_₿_🏃_20201007_132949\wallet_multiwallet_117\competing_walletdir. Bitcoin Core is probably already running."

Lol that's fun ^

Fixed.

https://ci.appveyor.com/project/DrahtBot/bitcoin/builds/35676234: wallet_multiwallet.py and feature_filelock.py passed.

@MarcoFalke
Could the "[DO NOT MERGE] ci: Temporarily enable the functional tests on AppVeyor" commit be dropped?

DrahtBot · 2020-10-07T19:32:19Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

Disable and fix tests for when BDB is not compiled #20267 (Disable and fix tests for when BDB is not compiled by achow101)
tests: Update more tests to work with descriptor wallets #18788 (tests: Update more tests to work with descriptor wallets by achow101)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

meshcollider · 2020-10-08T10:45:30Z

Approach ACK

hebasto · 2020-10-10T14:47:51Z

Fixed Windows paths.

hebasto · 2020-10-15T12:46:39Z

Rebased 33d49d7 -> 76ab0e7 (pr20094.06 -> pr20094.07) due to the conflict with #19077.

This change removes redundant LogPrintf call, and unifies error message wording with the similar datadir lock error message.

hebasto · 2020-10-29T15:22:49Z

Rebased 76ab0e7 -> 7504cac (pr20094.07 -> pr20094.08) due to the conflict with #20186.

hebasto · 2021-05-29T20:30:00Z

This does not make sense with SQLite wallets.

DrahtBot added the Wallet label Oct 6, 2020

hebasto force-pushed the 201006-name branch 2 times, most recently from 01df47b to 8598613 Compare October 6, 2020 19:08

hebasto marked this pull request as draft October 7, 2020 04:10

hebasto force-pushed the 201006-name branch from 8598613 to 4381819 Compare October 7, 2020 04:15

hebasto marked this pull request as ready for review October 7, 2020 04:15

maflcko changed the title ~~wallet, log, qa: Unify wallet directory lock error message~~ wallet: Unify wallet directory lock error message Oct 7, 2020

maflcko added this to the 0.22.0 milestone Oct 7, 2020

hebasto force-pushed the 201006-name branch from 4381819 to ef9a28f Compare October 7, 2020 08:21

maflcko reviewed Oct 7, 2020

View reviewed changes

hebasto marked this pull request as draft October 7, 2020 18:57

DrahtBot mentioned this pull request Oct 7, 2020

wallet: Add sqlite as an alternative wallet database and use it for new descriptor wallets #19077

Merged

hebasto force-pushed the 201006-name branch 2 times, most recently from 5a69040 to 33d49d7 Compare October 10, 2020 13:03

hebasto marked this pull request as ready for review October 10, 2020 14:43

DrahtBot mentioned this pull request Oct 12, 2020

rpc, wallet: Expose database format in getwalletinfo #20125

Merged

DrahtBot added the Needs rebase label Oct 15, 2020

hebasto force-pushed the 201006-name branch from 33d49d7 to 76ab0e7 Compare October 15, 2020 12:44

DrahtBot removed the Needs rebase label Oct 15, 2020

This was referenced Oct 16, 2020

tests: Update more tests to work with descriptor wallets #18788

Merged

wallet: Make -wallet setting not create wallets #20186

Merged

DrahtBot mentioned this pull request Oct 29, 2020

wallet: Create named SQLite wallet files instead of wallet directories #20260

Closed

DrahtBot added the Needs rebase label Oct 29, 2020

hebasto added 2 commits October 29, 2020 17:14

wallet, log, qa: Unify wallet directory lock error message

729b577

This change removes redundant LogPrintf call, and unifies error message wording with the similar datadir lock error message.

[DO NOT MERGE] ci: Temporarily enable the functional tests on AppVeyor

7504cac

hebasto force-pushed the 201006-name branch from 76ab0e7 to 7504cac Compare October 29, 2020 15:20

DrahtBot removed the Needs rebase label Oct 29, 2020

DrahtBot mentioned this pull request Oct 30, 2020

Disable and fix tests for when BDB is not compiled #20267

Merged

hebasto marked this pull request as draft October 30, 2020 10:21

hebasto closed this May 29, 2021

bitcoin locked as resolved and limited conversation to collaborators Aug 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wallet: Unify wallet directory lock error message#20094

wallet: Unify wallet directory lock error message#20094
hebasto wants to merge 2 commits intobitcoin:masterfrom
hebasto:201006-name

hebasto commented Oct 6, 2020

Uh oh!

maflcko commented Oct 7, 2020

Uh oh!

maflcko Oct 7, 2020

Uh oh!

hebasto Oct 7, 2020

Uh oh!

maflcko Oct 7, 2020

Uh oh!

meshcollider Oct 8, 2020

Uh oh!

hebasto Oct 10, 2020

Uh oh!

DrahtBot commented Oct 7, 2020 •

edited

Loading

Uh oh!

meshcollider commented Oct 8, 2020

Uh oh!

hebasto commented Oct 10, 2020

Uh oh!

hebasto commented Oct 15, 2020

Uh oh!

hebasto commented Oct 29, 2020

Uh oh!

hebasto commented May 29, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

hebasto commented Oct 6, 2020

Uh oh!

maflcko commented Oct 7, 2020

Uh oh!

maflcko Oct 7, 2020

Choose a reason for hiding this comment

Uh oh!

hebasto Oct 7, 2020

Choose a reason for hiding this comment

Uh oh!

maflcko Oct 7, 2020

Choose a reason for hiding this comment

Uh oh!

meshcollider Oct 8, 2020

Choose a reason for hiding this comment

Uh oh!

hebasto Oct 10, 2020

Choose a reason for hiding this comment

Uh oh!

DrahtBot commented Oct 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Conflicts

Uh oh!

meshcollider commented Oct 8, 2020

Uh oh!

hebasto commented Oct 10, 2020

Uh oh!

hebasto commented Oct 15, 2020

Uh oh!

hebasto commented Oct 29, 2020

Uh oh!

hebasto commented May 29, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DrahtBot commented Oct 7, 2020 •

edited

Loading