[backport PR12653] Allow to optional specify the directory for the blocks storage
ClosedPublic
Actions

Authored by markblundeberg on May 6 2019, 04:02.

Details

Reviewers

deadalnix
jasonbcox

Group Reviewers

Restricted Project

Maniphest Tasks

T636: Backport PR 12653 "Allow to optional specify the directory for the blocks storage"

Commits

rSTAGINGb8be8d8e31ba: [backport PR12653] Allow to optional specify the directory for the blocks…
rABCb8be8d8e31ba: [backport PR12653] Allow to optional specify the directory for the blocks…

Summary

from: https://github.com/bitcoin/bitcoin/pull/12653/files
a1926362e -blocksdir: keep blockindex leveldb database in datadir
f38e4fdb0 QA: Add -blocksdir test
386a6b62a Allow to optional specify the directory for the blocks storage

also includes bugfix PR15124 (Ben Woosley)
ba8c8b2227 Fail if either disk space check fails

Test Plan

make check
test_runner.py

manual testing on testnet

Diff Detail

Repository

rABC Bitcoin ABC

Branch

PR12653

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 5766
Build 9594: Bitcoin ABC Buildbot (legacy)
Build 9593: arc lint + arc unit

Event Timeline

markblundeberg created this revision.May 6 2019, 04:02

Herald added a reviewer: Restricted Project. · View Herald TranscriptMay 6 2019, 04:02

Herald added a reviewer: deadalnix. · View Herald Transcript

markblundeberg edited the summary of this revision. (Show Details)May 6 2019, 04:02

markblundeberg added a task: T636: Backport PR 12653 "Allow to optional specify the directory for the blocks storage".

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

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

Harbormaster completed remote builds in B5692: Diff 8407.May 6 2019, 04:17

Note, there are some future backports that should be done relating to this (but can't be done yet), see T636 description.

On further thought I think manual testing would be a good idea here, since /in theory/ it's possible that some codebase divergence means there could be a GetDataDir() somewhere else that needs to be changed over.

markblundeberg planned changes to this revision.May 7 2019, 14:11

rebase & did test on testnet

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

In D2939#69573, @markblundeberg wrote:

On further thought I think manual testing would be a good idea here, since /in theory/ it's possible that some codebase divergence means there could be a GetDataDir() somewhere else that needs to be changed over.

I checked for other GetDataDir invocations and none are relevant to blocks. + tested on regtest / testnet

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

Harbormaster completed remote builds in B5766: Diff 8528.May 8 2019, 21:31

BTW how this works: if you specify -blocksdir=/home/mark/spam then:

mainnet blocks will be under /home/mark/spam/blocks
testnet blocks will be under /home/mark/spam/testnet3/blocks

But index is still under the datadir, ie by default:

mainnet blockindex will be under /home/mark/.bitcoin/blocks/index
testnet blockindex will be under /home/mark/.bitcoin/testnet3/blocks/index

jasonbcox requested changes to this revision.May 9 2019, 20:52

jasonbcox added inline comments.

src/init.cpp
2264	In the future, please don't do this unless the fix is strictly necessary. You can have two separate diffs get reviewed and wait to land them around the same time after they are both green'd.
src/util.cpp
693	brackets
704	brackets