foster/bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-04 13:55:23 -05:00
Code Issues Activity

node/chainstate: Reduce coupling of LogPrintf

Browse source 
...by moving the try/catch out of LoadChainstate

I strongly recommend reviewing with the following git-diff flags:
  --color-moved=dimmed_zebra --color-moved-ws=allow-indentation-change
This commit is contained in:
Carl Dong 2021-08-18 13:54:08 -04:00
parent b345979a2b
commit aad8d59789
2 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/init.cpp
View file

@ -1419,20 +1419,26 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
uiInterface.InitMessage(_("Loading block index…").translated); uiInterface.InitMessage(_("Loading block index…").translated);
const int64_t load_block_index_start_time = GetTimeMillis(); const int64_t load_block_index_start_time = GetTimeMillis();
auto rv = LoadChainstate(fReset, std::optional<ChainstateLoadingError> rv;
chainman, try {
Assert(node.mempool.get()), rv = LoadChainstate(fReset,
fPruneMode, chainman,
chainparams, Assert(node.mempool.get()),
fReindexChainState, fPruneMode,
nBlockTreeDBCache, chainparams,
nCoinDBCache, fReindexChainState,
nCoinCacheUsage, nBlockTreeDBCache,
[]() { nCoinDBCache,
uiInterface.ThreadSafeMessageBox( nCoinCacheUsage,
_("Error reading from database, shutting down."), []() {
"", CClientUIInterface::MSG_ERROR); uiInterface.ThreadSafeMessageBox(
}); _("Error reading from database, shutting down."),
"", CClientUIInterface::MSG_ERROR);
});
} catch (const std::exception& e) {
LogPrintf("%s\n", e.what());
rv = ChainstateLoadingError::ERROR_GENERIC_BLOCKDB_OPEN_FAILED;
}
if (rv.has_value()) { if (rv.has_value()) {
switch (rv.value()) { switch (rv.value()) {
case ChainstateLoadingError::ERROR_LOADING_BLOCK_DB: case ChainstateLoadingError::ERROR_LOADING_BLOCK_DB:
@ -1468,13 +1474,19 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
break; break;
} }
} else { } else {
uiInterface.InitMessage(_("Verifying blocks…").translated); std::optional<ChainstateLoadVerifyError> rv2;
auto rv2 = VerifyLoadedChainstate(chainman, try {
fReset, uiInterface.InitMessage(_("Verifying blocks…").translated);
fReindexChainState, rv2 = VerifyLoadedChainstate(chainman,
chainparams, fReset,
args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS), fReindexChainState,
args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL)); chainparams,
args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS),
args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL));
} catch (const std::exception& e) {
LogPrintf("%s\n", e.what());
rv2 = ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE;
}
if (rv2.has_value()) { if (rv2.has_value()) {
switch (rv2.value()) { switch (rv2.value()) {
case ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE: case ChainstateLoadVerifyError::ERROR_BLOCK_FROM_FUTURE:

10
src/node/chainstate.cpp
View file

@ -26,7 +26,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull(); return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull();
}; };
try { {
LOCK(cs_main); LOCK(cs_main);
chainman.InitializeChainstate(mempool); chainman.InitializeChainstate(mempool);
chainman.m_total_coinstip_cache = nCoinCacheUsage; chainman.m_total_coinstip_cache = nCoinCacheUsage;
@ -113,9 +113,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
assert(chainstate->m_chain.Tip() != nullptr); assert(chainstate->m_chain.Tip() != nullptr);
} }
} }
} catch (const std::exception& e) {
LogPrintf("%s\n", e.what());
return ChainstateLoadingError::ERROR_GENERIC_BLOCKDB_OPEN_FAILED;
} }
if (!fReset) { if (!fReset) {
@ -141,7 +138,7 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull(); return fReset || fReindexChainState || chainstate->CoinsTip().GetBestBlock().IsNull();
}; };
try { {
LOCK(cs_main); LOCK(cs_main);
for (CChainState* chainstate : chainman.GetAll()) { for (CChainState* chainstate : chainman.GetAll()) {
@ -165,9 +162,6 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
} }
} }
} }
} catch (const std::exception& e) {
LogPrintf("%s\n", e.what());
return ChainstateLoadVerifyError::ERROR_GENERIC_FAILURE;
} }
return std::nullopt; return std::nullopt;