Skip to content

[29.x] backport #33212#33251

Merged
fanquake merged 2 commits into
bitcoin:29.xfrom
fjahr:29.x-backport-index-fix
Aug 27, 2025
Merged

[29.x] backport #33212#33251
fanquake merged 2 commits into
bitcoin:29.xfrom
fjahr:29.x-backport-index-fix

Conversation

@fjahr

@fjahr fjahr commented Aug 24, 2025

Copy link
Copy Markdown
Contributor

Backports #33212 to 29.x

@DrahtBot

DrahtBot commented Aug 24, 2025

Copy link
Copy Markdown
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/33251.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK stickies-v, achow101, mzumsande

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

@fanquake

Copy link
Copy Markdown
Member

Can you add the GitHub-Pull / Rebased-From metadata to each commit.

@fanquake fanquake added this to the 29.1 milestone Aug 24, 2025
The committed state of an index should never
be ahead of the flushed chainstate. Otherwise, in the case
of an unclean shutdown, the blocks necessary to revert
from the prematurely committed state would not be
available, which would corrupt the coinstatsindex in particular.
Instead, the index state will be committed with the next
ChainStateFlushed notification.

Github-Pull: bitcoin#33212
Rebased-From: 01b95ac
This test fails without the previous commit.

Github-Pull: bitcoin#33212
Rebased-From: a602f6f
@fjahr fjahr force-pushed the 29.x-backport-index-fix branch from 8f06292 to fcac802 Compare August 24, 2025 21:51
@fjahr

fjahr commented Aug 24, 2025

Copy link
Copy Markdown
Contributor Author

Can you add the GitHub-Pull / Rebased-From metadata to each commit.

done

@stickies-v stickies-v left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK fcac802

There have been quite substantial changes to BaseIndex::Rewind() in 6f1392c that might warrant extra careful review, even though I couldn't find any issues.

The rationale and mechanics from the original PR all still hold here, and the changes look correct to me. The backport commits are clean, and the added test in fcac802 still fails without the fix in 16b1710.

@fanquake

Copy link
Copy Markdown
Member

cc @mzumsande

@achow101

Copy link
Copy Markdown
Member

ACK fcac802

@mzumsande mzumsande left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review ACK fcac802

@fanquake fanquake merged commit 162c009 into bitcoin:29.x Aug 27, 2025
18 checks passed
@fanquake fanquake mentioned this pull request Aug 29, 2025
glozow added a commit that referenced this pull request Sep 3, 2025
084c95a doc: update manual pages for v29.1 (fanquake)
37d115c build: bump version to v29.1 final (fanquake)
b0d88bc doc: finalise release notes for 29.1 (fanquake)
99ab2e7 ci: return to using dash in CentOS job (fanquake)
6448ebb doc: Remove wrong and redundant doxygen tag (MarcoFalke)

Pull request description:

  Backports:
  * #33236
  * #33261

  Since `rc2`, #33212 was also backported in #33251.

ACKs for top commit:
  glozow:
    ACK 084c95a
  willcl-ark:
    ACK 084c95a

Tree-SHA512: 0698e5b2d12f7328bf5af8dbbd92b0049de401c0a4af27fda2209f9aab35d827c5ac65eb9268aa1fae241e3adf0d3dd89324bb288655ead8af2b5584aae1f6d2
morozow pushed a commit to morozow/bitcoin_rd that referenced this pull request May 8, 2026
c115cf1 test: index with an unclean restart after a reorg (Martin Zumsande)
794b0d1 index: don't commit state in BaseIndex::Rewind (Martin Zumsande)

Pull request description:

  Backports bitcoin#33212 to 29.x

ACKs for top commit:
  achow101:
    ACK c115cf1
  stickies-v:
    ACK c115cf1
  mzumsande:
    Code Review ACK c115cf1

Tree-SHA512: eeb9213f03bbb1d48c3ccb12121a6e475f436895d314b5171007e7e4ee457c74b312fa7f0d1808d6221dc22b192700a93ea21c4e9e04689da7dde7e1f79e9569
morozow pushed a commit to morozow/bitcoin_rd that referenced this pull request May 8, 2026
37dd344 doc: update manual pages for v29.1 (fanquake)
9d959a7 build: bump version to v29.1 final (fanquake)
373e718 doc: finalise release notes for 29.1 (fanquake)
d7220cc ci: return to using dash in CentOS job (fanquake)
555a8fe doc: Remove wrong and redundant doxygen tag (MarcoFalke)

Pull request description:

  Backports:
  * bitcoin#33236
  * bitcoin#33261

  Since `rc2`, bitcoin#33212 was also backported in bitcoin#33251.

ACKs for top commit:
  glozow:
    ACK 37dd344
  willcl-ark:
    ACK 37dd344

Tree-SHA512: 0698e5b2d12f7328bf5af8dbbd92b0049de401c0a4af27fda2209f9aab35d827c5ac65eb9268aa1fae241e3adf0d3dd89324bb288655ead8af2b5584aae1f6d2
ivanlele added a commit to ivanlele/elements that referenced this pull request Jul 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants