Skip to content

Commit 8625446

Browse files
committed
Merge #17336: scripts: search for first block file for linearize-data with some block files pruned
317fb96 Add search for first blk file with pruned node (Rjected) Pull request description: <!-- *** Please remove the following help text before submitting: *** Pull requests without a rationale and clear improvement may be closed immediately. --> <!-- Please provide clear motivation for your patch and explain how it improves Bitcoin Core user experience or Bitcoin Core developer experience significantly: * Any test improvements or new tests that improve coverage are always welcome. * All other changes should have accompanying unit tests (see `src/test/`) or functional tests (see `test/`). Contributors should note which tests cover modified code. If no tests exist for a region of modified code, new tests should accompany the change. * Bug fixes are most welcome when they come with steps to reproduce or an explanation of the potential issue as well as reasoning for the way the bug was fixed. * Features are welcome, but might be rejected due to design or scope issues. If a feature is based on a lot of dependencies, contributors should first consider building the system outside of Bitcoin Core, if possible. * Refactoring changes are only accepted if they are required for a feature or bug fix or otherwise improve developer experience significantly. For example, most "code style" refactoring changes require a thorough explanation why they are useful, what downsides they have and why they *significantly* improve developer experience or avoid serious programming bugs. Note that code style is often a subjective matter. Unless they are explicitly mentioned to be preferred in the [developer notes](/doc/developer-notes.md), stylistic code changes are usually rejected. --> When bitcoind is running in pruned mode, producing a hashlist with `./linearize-hashes.py linearize.cfg > hashlist.txt` and then executing `linearize-data.py linearize.cfg` will produce: ``` Read 313001 hashes Input file /home/dan/.bitcoin/blocks/blk00000.dat Premature end of block data ``` This happens because `linearize-data` starts by attempting to process `blk00000.dat` regardless of whether or not `blk00000.dat` actually exists - this may not be the case if working with a pruned node. This PR adds a function which finds the first block file that does exist, and calls that function when the `BlockDataCopier` is initialized. This is a refactor of #16431. <!-- Bitcoin Core has a thorough review process and even the most trivial change needs to pass a lot of eyes and requires non-zero or even substantial time effort to review. There is a huge lack of active reviewers on the project, so patches often sit for a long time. --> ACKs for top commit: darosior: ACK 317fb96 laanwj: Code review ACK 317fb96 theStack: Code review ACK bitcoin/bitcoin@317fb96 Tree-SHA512: fc8014282df6cfe7b267e64db8ce7d82b86b758c302fbfea4a3c39b62d93512f5c2e31a0de4e9c5ec18fc0268c917f011257d37b45afaef6033eec90e4aa585f
2 parents f32564f + 317fb96 commit 8625446

File tree

1 file changed

+28
-1
lines changed

1 file changed

+28
-1
lines changed

contrib/linearize/linearize-data.py

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import hashlib
1616
import datetime
1717
import time
18+
import glob
1819
from collections import namedtuple
1920
from binascii import unhexlify
2021

@@ -92,6 +93,30 @@ def mkblockmap(blkindex):
9293
blkmap[hash] = height
9394
return blkmap
9495

96+
# This gets the first block file ID that exists from the input block
97+
# file directory.
98+
def getFirstBlockFileId(block_dir_path):
99+
# First, this sets up a pattern to search for block files, for
100+
# example 'blkNNNNN.dat'.
101+
blkFilePattern = os.path.join(block_dir_path, "blk[0-9][0-9][0-9][0-9][0-9].dat")
102+
103+
# This search is done with glob
104+
blkFnList = glob.glob(blkFilePattern)
105+
106+
if len(blkFnList) == 0:
107+
print("blocks not pruned - starting at 0")
108+
return 0
109+
# We then get the lexicographic minimum, which should be the first
110+
# block file name.
111+
firstBlkFilePath = min(blkFnList)
112+
firstBlkFn = os.path.basename(firstBlkFilePath)
113+
114+
# now, the string should be ['b','l','k','N','N','N','N','N','.','d','a','t']
115+
# So get the ID by choosing: 3 4 5 6 7
116+
# The ID is not necessarily 0 if this is a pruned node.
117+
blkId = int(firstBlkFn[3:8])
118+
return blkId
119+
95120
# Block header and extent on disk
96121
BlockExtent = namedtuple('BlockExtent', ['fn', 'offset', 'inhdr', 'blkhdr', 'size'])
97122

@@ -101,7 +126,9 @@ def __init__(self, settings, blkindex, blkmap):
101126
self.blkindex = blkindex
102127
self.blkmap = blkmap
103128

104-
self.inFn = 0
129+
# Get first occurring block file id - for pruned nodes this
130+
# will not necessarily be 0
131+
self.inFn = getFirstBlockFileId(self.settings['input'])
105132
self.inF = None
106133
self.outFn = 0
107134
self.outsz = 0

0 commit comments

Comments
 (0)