Skip to content
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.

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

0.18: Granular invalidateblock and RewindBlockIndex #15552

Merged
merged 11 commits into from Mar 7, 2019

Conversation

Projects
None yet
5 participants
@MarcoFalke
Copy link
Member

commented Mar 6, 2019

Same repo and branch like "Granular invalidateblock and RewindBlockIndex #15402 ", can be merged as is.

This saves us all the cherry-picks and review of the backport cherry-picks.

@sipa

This comment has been minimized.

Copy link
Member

commented Mar 6, 2019

correct-trivial-rebase-ACK 519b0bc

@laanwj laanwj merged commit 519b0bc into bitcoin:0.18 Mar 7, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Mar 7, 2019

Merge #15552: 0.18: Granular invalidateblock and RewindBlockIndex
519b0bc Make last disconnected block BLOCK_FAILED_VALID, even when aborted (Pieter Wuille)
8d22041 Optimization: don't add txn back to mempool after 10 invalidates (Pieter Wuille)
9ce9c37 Prevent callback overruns in InvalidateBlock and RewindBlockIndex (Pieter Wuille)
9bb32eb Release cs_main during InvalidateBlock iterations (Pieter Wuille)
9b1ff5c Call InvalidateBlock without cs_main held (Pieter Wuille)
241b2c7 Make RewindBlockIndex interruptible (Pieter Wuille)
880ce7d Call RewindBlockIndex without cs_main held (Pieter Wuille)
436f7d7 Release cs_main during RewindBlockIndex operation (Pieter Wuille)
1d34287 Merge the disconnection and erasing loops in RewindBlockIndex (Pieter Wuille)
32b2696 Move erasure of non-active blocks to a separate loop in RewindBlockIndex (Pieter Wuille)
9d6dcc5 Abstract EraseBlockData out of RewindBlockIndex (Pieter Wuille)

Pull request description:

  Same repo and branch like  "Granular invalidateblock and RewindBlockIndex #15402 ", can be merged as is.

  This saves us all the cherry-picks and review of the backport cherry-picks.

Tree-SHA512: 20c27c5f807c3d85e0072f9e2cdefad4ad7d329d6b26658a00844d5fcf0ed729059daf765e04e6382db2b5915117b15949cd4989d864917ab105c92e2e5e9986
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.