highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-09-01 06:22:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

index: Commit DB_MUHASH and DB_BEST_BLOCK to disk together

Browse Source 
If these are written to disk at different times,
unclean shutdowns can lead to index corruption.
This commit is contained in:
Martin Zumsande
2022-01-24 14:34:28 +01:00
parent 48a90c61e2
commit eb6cc05da3
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/index/coinstatsindex.cpp
View File

@@ -228,10 +228,9 @@ bool CoinStatsIndex::WriteBlock(const CBlock& block, const CBlockIndex* pindex)
m_muhash.Finalize(out); m_muhash.Finalize(out);
value.second.muhash = out; value.second.muhash = out;
CDBBatch batch(*m_db); // Intentionally do not update DB_MUHASH here so it stays in sync with
batch.Write(DBHeightKey(pindex->nHeight), value); // DB_BEST_BLOCK, and the index is not corrupted if there is an unclean shutdown.
batch.Write(DB_MUHASH, m_muhash); return m_db->Write(DBHeightKey(pindex->nHeight), value);
return m_db->WriteBatch(batch);
} }
static bool CopyHeightIndexToHashIndex(CDBIterator& db_it, CDBBatch& batch, static bool CopyHeightIndexToHashIndex(CDBIterator& db_it, CDBBatch& batch,
@@ -388,6 +387,14 @@ bool CoinStatsIndex::Init()
return true; return true;
} }
bool CoinStatsIndex::CommitInternal(CDBBatch& batch)
{
// DB_MUHASH should always be committed in a batch together with DB_BEST_BLOCK
// to prevent an inconsistent state of the DB.
batch.Write(DB_MUHASH, m_muhash);
return BaseIndex::CommitInternal(batch);
}
// Reverse a single block as part of a reorg // Reverse a single block as part of a reorg
bool CoinStatsIndex::ReverseBlock(const CBlock& block, const CBlockIndex* pindex) bool CoinStatsIndex::ReverseBlock(const CBlock& block, const CBlockIndex* pindex)
{ {
@@ -489,5 +496,5 @@ bool CoinStatsIndex::ReverseBlock(const CBlock& block, const CBlockIndex* pindex
Assert(m_total_unspendables_scripts == read_out.second.total_unspendables_scripts); Assert(m_total_unspendables_scripts == read_out.second.total_unspendables_scripts);
Assert(m_total_unspendables_unclaimed_rewards == read_out.second.total_unspendables_unclaimed_rewards); Assert(m_total_unspendables_unclaimed_rewards == read_out.second.total_unspendables_unclaimed_rewards);
return m_db->Write(DB_MUHASH, m_muhash); return true;
} }

2
src/index/coinstatsindex.h
View File

@@ -39,6 +39,8 @@ private:
protected: protected:
bool Init() override; bool Init() override;
bool CommitInternal(CDBBatch& batch) override;
bool WriteBlock(const CBlock& block, const CBlockIndex* pindex) override; bool WriteBlock(const CBlock& block, const CBlockIndex* pindex) override;
bool Rewind(const CBlockIndex* current_tip, const CBlockIndex* new_tip) override; bool Rewind(const CBlockIndex* current_tip, const CBlockIndex* new_tip) override;