From f65b0f6401091e4a4ca4c9f4db1cf388f0336bad Mon Sep 17 00:00:00 2001 From: Fabian Jahr Date: Sun, 17 Mar 2024 20:37:42 +0100 Subject: [PATCH] index: Move last_locator_write_time and logging to end of threadsync loop This avoids having commit print a needless error message during init. Co-authored-by: furszy --- src/index/base.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/index/base.cpp b/src/index/base.cpp index 036292cd8a11c..21b93209b94e1 100644 --- a/src/index/base.cpp +++ b/src/index/base.cpp @@ -177,20 +177,6 @@ void BaseIndex::ThreadSync() pindex = pindex_next; } - auto current_time{std::chrono::steady_clock::now()}; - if (last_log_time + SYNC_LOG_INTERVAL < current_time) { - LogPrintf("Syncing %s with block chain from height %d\n", - GetName(), pindex->nHeight); - last_log_time = current_time; - } - - if (last_locator_write_time + SYNC_LOCATOR_WRITE_INTERVAL < current_time) { - SetBestBlockIndex(pindex->pprev); - last_locator_write_time = current_time; - // No need to handle errors in Commit. See rationale above. - Commit(); - } - CBlock block; interfaces::BlockInfo block_info = kernel::MakeBlockInfo(pindex); if (!m_chainstate->m_blockman.ReadBlockFromDisk(block, *pindex)) { @@ -205,6 +191,20 @@ void BaseIndex::ThreadSync() __func__, pindex->GetBlockHash().ToString()); return; } + + auto current_time{std::chrono::steady_clock::now()}; + if (last_log_time + SYNC_LOG_INTERVAL < current_time) { + LogPrintf("Syncing %s with block chain from height %d\n", + GetName(), pindex->nHeight); + last_log_time = current_time; + } + + if (last_locator_write_time + SYNC_LOCATOR_WRITE_INTERVAL < current_time) { + SetBestBlockIndex(pindex); + last_locator_write_time = current_time; + // No need to handle errors in Commit. See rationale above. + Commit(); + } } }