utils and libraries: Make 'blocksdir' always net specific #14409

pull hebasto wants to merge 2 commits into bitcoin:master from hebasto:20181005-blockspath-always-netspecific changing 4 files +8 −8
  1. hebasto commented at 6:25 PM on October 5, 2018: member

    The blocks directory is net specific by definition.

    Also this prevents the side effect of calling GetBlocksDir(false) in the non-mainnet environment. Currently a new node creates an unused blocks\ directory in the root of the data directory when -testnet or -regtest is specified.

    Refs:

  2. hebasto renamed this:
    utils and libraries: Make blockdir always net specific
    utils and libraries: Make 'blocksdir' always net specific
    on Oct 5, 2018
  3. DrahtBot commented at 7:06 PM on October 5, 2018: contributor

    <!--e57a25ab6845829454e8d69fc972939a-->

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

    <!--174a7506f384e20aa4161008e828411d-->

    Conflicts

    Reviewers, this pull request conflicts with the following ones:

    • #13746 (-masterdatadir for datadir bootstrapping by kallewoof)

    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.

  4. DrahtBot cross-referenced this on Oct 5, 2018 from issue -masterdatadir for datadir bootstrapping by kallewoof
  5. DrahtBot cross-referenced this on Oct 5, 2018 from issue Check for datadir after the config files were read by Flowdalic
  6. fanquake added the label Utils/log/libs on Oct 5, 2018
  7. ken2812221 commented at 4:11 PM on October 6, 2018: contributor

    Concept ACK. This seem to require a release note.

  8. MarcoFalke added the label Needs release notes on Oct 7, 2018
  9. MarcoFalke commented at 4:58 AM on October 9, 2018: member

    Needs tests before merge

  10. meshcollider commented at 2:40 PM on October 12, 2018: contributor

    Concept ACK, so this only affects the case where the user has explicitly specified a directory with the -blocksdir argument right?

  11. hebasto commented at 2:49 PM on October 12, 2018: member

    @MeshCollider

    Thank you for your review.

    Concept ACK, so this only affects the case where the user has explicitly specified a directory with the -blocksdir argument right?

    This PR works regardless of the -blocksdir option.

  12. sipa commented at 7:09 PM on October 12, 2018: member

    Does this risk breaking any existing configurations?

  13. meshcollider commented at 11:06 PM on October 12, 2018: contributor

    @sipa that was my concern, the actual behaviour looks unchanged but I think now if you specify a base directory with -blocksdir it will error if the child directory doesn't exist, previously it would just create it? Which could be annoying for users...

  14. hebasto commented at 10:42 AM on October 13, 2018: member

    @MeshCollider @sipa

    ... I think now if you specify a base directory with -blocksdir it will error if the child directory doesn't exist, previously it would just create it?

    Test of this PR:

    $ rm -rf /home/hebasto/.bitcoin/
$ /home/hebasto/github/bitcoin/src/bitcoind
2018-10-13T09:27:14Z Bitcoin Core version v0.17.99.0-c1a60d4a1 (release build)
...
2018-10-13T09:27:30Z Shutdown: done
$ find /home/hebasto/.bitcoin/ > ~/pr14409-without-blocksdir

$ rm -rf /home/hebasto/.bitcoin/
$ /home/hebasto/github/bitcoin/src/bitcoind -blocksdir=/home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR
2018-10-13T09:33:59Z Bitcoin Core version v0.17.99.0-c1a60d4a1 (release build)
2018-10-13T09:33:59Z InitParameterInteraction: parameter interaction: -whitelistforcerelay=1 -> setting -whitelistrelay=1
2018-10-13T09:33:59Z Error: Specified blocks directory "/home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR" does not exist.
Error: Specified blocks directory "/home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR" does not exist
$ mkdir -p /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR
$ /home/hebasto/github/bitcoin/src/bitcoind -blocksdir=/home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR
2018-10-13T09:36:37Z Bitcoin Core version v0.17.99.0-c1a60d4a1 (release build)
...
2018-10-13T09:37:00Z Shutdown: done
$ find /home/hebasto/.bitcoin/ > ~/pr14409-with-blocksdir

$ diff ~/pr14409-without-blocksdir ~/pr14409-with-blocksdir 
3a4,8
> /home/hebasto/.bitcoin/TEST_DIR
> /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR
> /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR/blocks
> /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR/blocks/rev00000.dat
> /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR/blocks/blk00000.dat
12d16
< /home/hebasto/.bitcoin/blocks/rev00000.dat
18d21
< /home/hebasto/.bitcoin/blocks/blk00000.dat

    Test of master be992701b:

    $ rm -rf /home/hebasto/.bitcoin/
$ /home/hebasto/github/bitcoin/src/bitcoind
2018-10-13T10:19:33Z Bitcoin Core version v0.17.99.0-be992701b (release build)
...
2018-10-13T10:19:51Z Shutdown: done
$ find /home/hebasto/.bitcoin/ > ~/master-be992701b-without-blocksdir

$ rm -rf /home/hebasto/.bitcoin/
$ /home/hebasto/github/bitcoin/src/bitcoind -blocksdir=/home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR
2018-10-13T10:22:30Z Bitcoin Core version v0.17.99.0-be992701b (release build)
2018-10-13T10:22:30Z InitParameterInteraction: parameter interaction: -whitelistforcerelay=1 -> setting -whitelistrelay=1
2018-10-13T10:22:30Z Error: Specified blocks directory "/home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR" does not exist.
Error: Specified blocks directory "/home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR" does not exist.
$ mkdir -p /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR
$ /home/hebasto/github/bitcoin/src/bitcoind -blocksdir=/home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR
2018-10-13T10:23:18Z Bitcoin Core version v0.17.99.0-be992701b (release build)
...
2018-10-13T10:23:35Z Shutdown: done
$ find /home/hebasto/.bitcoin/ > ~/master-be992701b-with-blocksdir

$ diff ~/master-be992701b-without-blocksdir ~/master-be992701b-with-blocksdir 
3a4,8
> /home/hebasto/.bitcoin/TEST_DIR
> /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR
> /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR/blocks
> /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR/blocks/rev00000.dat
> /home/hebasto/.bitcoin/TEST_DIR/TEST_BLOCKS_DIR/blocks/blk00000.dat
12d16
< /home/hebasto/.bitcoin/blocks/rev00000.dat
18d21
< /home/hebasto/.bitcoin/blocks/blk00000.dat

    The behaviour is unchanged. If you specify a base directory with -blocksdir and if the child directory doesn't exist it will an error both on master and on this PR.

  15. MarcoFalke added the label Refactoring on Oct 23, 2018
  16. MarcoFalke removed the label Needs release notes on Oct 23, 2018
  17. MarcoFalke removed the label Refactoring on Oct 23, 2018
  18. DrahtBot added the label Needs rebase on Nov 5, 2018
  19. Make blockdir always net specific
    The blocks directory is net specific by definition.

Also this prevents the side effect of calling GetBlocksDir(false) in the
non-mainnet environment.
    c3f1821ac7
  20. hebasto force-pushed on Nov 5, 2018
  21. hebasto commented at 11:29 AM on November 5, 2018: member

    Rebased.

  22. DrahtBot removed the label Needs rebase on Nov 5, 2018
  23. hebasto cross-referenced this on Nov 5, 2018 from issue Add -chainstatedir and -blocksdir in bitcoin.conf by Janaka-Steph
  24. laanwj commented at 7:06 AM on November 23, 2018: member

    This absolutely needs testing in a functional test.

    Also to make it clear what behavior is failing right now, and which will pass after this.

  25. Improve blocksdir functional test.
    A new node should not create an unused `blocks` directory in the root of
the data directory when `-testnet` or `-regtest` is specified.
    e4a0c3547e
  26. hebasto commented at 3:23 PM on November 30, 2018: member

    @laanwj Thank you for your review.

    This absolutely needs testing in a functional test. Also to make it clear what behavior is failing right now, and which will pass after this.

    The existed feature_blocksdir.py functional test has been patched. Currently this patched test fails on master.

  27. laanwj commented at 2:57 PM on December 13, 2018: member

    utACK e4a0c3547ed886871f8b3d51c6b4ffdb181a8b9c

  28. MarcoFalke commented at 5:52 PM on December 22, 2018: member

    utACK e4a0c3547ed886871f8b3d51c6b4ffdb181a8b9c

  29. MarcoFalke cross-referenced this on Dec 22, 2018 from issue 0.17 doesn't seem to use ~/.bitcoin/testnet3 anymore by zciendor
  30. laanwj merged this on Jan 16, 2019
  31. laanwj closed this on Jan 16, 2019
  32. laanwj referenced this in commit 64ee94356f on Jan 16, 2019
  33. hebasto deleted the branch on Jan 16, 2019
  34. MarcoFalke added the label Needs backport on Feb 9, 2019
  35. MarcoFalke added this to the milestone 0.17.2 on Feb 9, 2019
  36. hebasto cross-referenced this on Feb 19, 2019 from issue doc: Clarify -blocksdir usage by sangaman
  37. hebasto cross-referenced this on Feb 19, 2019 from issue [0.17] backport #14409 by hebasto
  38. hebasto referenced this in commit 75bee85900 on Feb 22, 2019
  39. hebasto referenced this in commit 8cdd72e7e8 on Feb 22, 2019
  40. fanquake removed the label Needs backport on Mar 11, 2019
  41. fanquake commented at 12:52 AM on March 11, 2019: member

    Being backported in #15445.

  42. furszy cross-referenced this on Apr 20, 2021 from issue [Test][Misc] Fix libsecp256k1 init for unit test setup + Allow to specify blocks storage directory by furszy
  43. random-zebra referenced this in commit edfaec63c2 on May 1, 2021
  44. PastaPastaPasta referenced this in commit c1d86731ef on Jun 26, 2021
  45. PastaPastaPasta referenced this in commit a8c5821419 on Jun 27, 2021
  46. PastaPastaPasta referenced this in commit b12c459007 on Jun 28, 2021
  47. bitcoin locked this on Dec 16, 2021
Contributors
hebastoDrahtBotken2812221MarcoFalkemeshcollidersipalaanwjfanquake
Labels
Utils/log/libs

Milestone
0.17.2

Linked (view graph)
#12653 Allow to optional specify the directory for the blocks storage#14364 doc: Clarify -blocksdir usage#14557 0.17 doesn't seem to use ~/.bitcoin/testnet3 anymore#14595 Add -chainstatedir and -blocksdir in bitcoin.conf#15445 [0.17] backport #14409
github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-05-20 06:54 UTC