Skip to content

blockman: Properly guard blockfile members #24456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
dongcarl wants to merge 3 commits into from
Closed

blockman: Properly guard blockfile members #24456

dongcarl wants to merge 3 commits into from

Conversation

@dongcarl
Copy link
Contributor

@dongcarl dongcarl commented Mar 1, 2022

Logically a rebase of: #15191
Based on and split off from: #22564

Last commit arose out of review: #22564 (comment)

@DrahtBot
Copy link
Contributor

DrahtBot commented Mar 2, 2022 •
edited
Loading

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

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #24595 (deploymentstatus: move g_versionbitscache global to ChainstateManager by ajtowns)
  • #24571 (p2p: Prevent block index fingerprinting by sending additional getheaders messages by dergoegge)
  • #24543 (net processing: Move remaining globals into PeerManagerImpl by dergoegge)
  • #24232 (assumeutxo: add init and completion logic by jamesob)
  • #24202 (rpc: allow dumptxoutset to dump human-readable data by w0xlt)
  • #24171 (p2p: Sync chain more readily from inbound peers during IBD by sdaftuar)
  • #24098 (rest: Use query parameters to control resource loading by stickies-v)
  • #24008 (assumeutxo: net_processing changes by jamesob)
  • #23599 (Tidy up RPCTxSerializationFlags by MarcoFalke)
  • #23443 (p2p: Erlay support signaling by naumenkogs)
  • #21726 (Improve Indices on pruned nodes via prune blockers by fjahr)
  • #20030 (validation: Remove useless call to mempool->clear() by MarcoFalke)
  • #19888 (rpc, test: Improve getblockstats for unspendables by fjahr)

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.

This was referenced Mar 2, 2022
Merged
Closed
Closed
Closed
Merged
Merged
Closed
Closed
Closed
Merged
Merged
Closed
Merged
Closed
@dongcarl dongcarl marked this pull request as draft March 7, 2022 14:14
@dongcarl
Copy link
Contributor Author

dongcarl commented Mar 7, 2022

Pushed 422f1f37e6a89a36bc09d5898f08e5cf7263ac81 -> 1b95be4ebe3eeea404cb44f35f31ce6d58e2bbe8

  • Rebased over master

This was referenced Mar 8, 2022
Closed
Draft
Merged
Merged
Merged
This was referenced Mar 12, 2022
Merged
Closed
Merged
@dongcarl
Copy link
Contributor Author

dongcarl commented Mar 24, 2022

Pushed 1b95be4ebe3eeea404cb44f35f31ce6d58e2bbe8 -> f097cc3b23dede7d3afec9a6bea48e76f9bb4938

@DrahtBot DrahtBot mentioned this pull request Mar 26, 2022
Merged
@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 6, 2022

🐙 This pull request conflicts with the target branch and needs rebase.

Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".

dongcarl added 3 commits May 4, 2022 11:09
@dongcarl
blockman: Properly guard blockfile members
55edcef 
Add GUARDED_BY(cs_LastBlockFile) annotations to:
- m_blockfile_info
- m_last_blockfile
- m_check_for_pruning

Add locking annotations as appropriate.

[META] Some of these LOCK annotations will be turned into a
       AssertLockHeld+EXCLUSIVE_LOCKS_REQUIRED combo in the next commit
@dongcarl
blockman: Replace some LOCKs with require annotations
da4cd7a
@dongcarl
validation: Guard nBlockReverseSequenceId with cs_main
d69bca1 
It is only used in CChainState::PreciousBlock with ::cs_main locked.
@dongcarl dongcarl force-pushed the 2022-02-kirby-p4 branch from f097cc3 to d69bca1 Compare May 4, 2022 15:31
@dongcarl
Copy link
Contributor Author

dongcarl commented May 4, 2022

Pushed f097cc3b23dede7d3afec9a6bea48e76f9bb4938 -> d69bca1

  • Rebased over master

@dongcarl
Copy link
Contributor Author

dongcarl commented May 4, 2022

Not going to nurse this PR anymore, feel free to take for yourself!

@dongcarl dongcarl closed this May 4, 2022
@bitcoin bitcoin locked and limited conversation to collaborators May 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Block storage Needs rebase P2P RPC/REST/ZMQ Up for grabs Validation Wallet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dongcarl @DrahtBot @fanquake