Bug: fix missing cs_main lock in AppInitMain and LoadExternalBlockFile #2728
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
random-zebra
force-pushed
the
202201_fix_cs-main
branch
from
22ec77f
to
eca2977
Compare
and in calls to TxToJSON/blockToJSON from rest.cpp Add more locking annotations and assertions.
random-zebra
force-pushed
the
202201_fix_cs-main
branch
from
eca2977
to
5ca8e22
Compare
Fuzzbawls
reviewed
Jan 23, 2022
Fuzzbawls
approved these changes
Jan 23, 2022
furszy
reviewed
Jan 23, 2022
furszy
approved these changes
Jan 23, 2022
furszy
added a commit
that referenced
this pull request
Feb 3, 2022
…JSON and TxToJSON 5e0d308 rpc: Remove cs_main lock from TxToJSON (random-zebra) fe7b1cf rpc: Remove cs_main lock from blockToJSON and blockHeaderToJSON (João Barbosa) Pull request description: Follow-up to #2728. This pull makes blockToJSON, blockheaderToJSON, and TxToJSON free of cs_main locks by passing the chainTip and using `GetAncestor` to check if a block is part of the active chain (as per bitcoin#12151). ACKs for top commit: Fuzzbawls: ACK 5e0d308 furszy: utACK 5e0d308 and merging.. Tree-SHA512: 800b45962489a66d45044618c1a40f39cd498efd7eb573db5cf0d6a07edf9fa68ca0e69a3a599f133802daddb1d2efd4ecb80d0bbf1fd17f8b4cef67ee7dd410
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#2715 introduced a locking assertion in
InsertBlockIndex, which is currently failing (with debug enabled) becausecs_mainis not held during the blockindex load inAppInitMain(bitcoin@c651df8).Also,
LookupBlockIndexis being called without cs_main inLoadExternalBlockFile(bitcoin@f814a3e).Finally there's a couple of missing locks in rest.cpp (which can be removed later, porting bitcoin#12151).