tests: Handle BDB dynamic pagesize #31222

pull achow101 wants to merge 1 commits into bitcoin:master from achow101:test-bdb-pagesize changing 1 files +7 −4

achow101 commented at 5:55 PM on November 5, 2024: member

BDB may choose to use a pagesize other than 4096. As such, the parser should use the pagesize given by the BDB file.

Fixes #31210

tests: Handle BDB dynamic pagesize

BDB may choose to use a pagesize other than 4096. As such, the parser
should use the pagesize given by the BDB file.

74ff8467d1

DrahtBot commented at 5:55 PM on November 5, 2024: contributor


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



Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/31222.



Reviews

See the guideline for information on the review process.

Type Reviewers

Concept ACK theStack

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #30125 (test: improve BDB parser (handle internal/overflow pages, support all page sizes) by theStack)
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.
DrahtBot added the label Tests on Nov 5, 2024

Type	Reviewers
Concept ACK	theStack

in test/functional/test_framework/bdb.py:135 in 74ff8467d1

 130 | @@ -132,10 +131,14 @@ def dump_bdb_kv(filename):
 131 |      # Read in the BDB file and start deserializing it
 132 |      pages = []
 133 |      with open(filename, 'rb') as f:
 134 | -        data = f.read(PAGESIZE)
 135 | +        # Read the outer meta page for the page size. It will always be at least 512 bytes.
 136 | +        metadata = dump_meta_page(f.read(MIN_PAGESIZE))

laanwj commented at 10:44 AM on November 6, 2024:

Might want to do some basic checks on the pagesize; eg

MIN_PAGESIZE = 512
MAX_PAGESIZE = 65536
⋮
assert pagesize >= MIN_PAGESIZE and pagesize <= MAX_PAGESIZE and (pagesize & (pagesize-1) == 0)

theStack commented at 12:59 PM on November 6, 2024: contributor

Concept ACK

Note that a similar change is also included in #30125, but happy to rebase if this one goes in first.
achow101 commented at 9:10 PM on November 6, 2024: member

Note that a similar change is also included in #30125,

Oh, right, forgot about that PR. Closing in favor of it.
achow101 closed this on Nov 6, 2024
bitcoin locked this on Nov 6, 2025

Contributors

Labels

Linked (view graph)

#31210 intermittent issue in wallet_upgradewallet.py: AssertionError: bdb magic does not match bdb btree magic

tests: Handle BDB dynamic pagesize #31222

Code Coverage & Benchmarks

Reviews

Conflicts