diff options
author | Jim Posen <jim.posen@gmail.com> | 2020-01-08 15:07:46 -0500 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-01-22 17:51:23 +0800 |
commit | 9d980c1f7f6fd0eb686d3cc94ba4698547f151c2 (patch) | |
tree | 1359256ff11fae045c5f817089b2d1e41f653361 | |
parent | 98159132c3e7f3ea62dc8d3e0afc1e49a6000c3d (diff) | |
download | bitcoin-9d980c1f7f6fd0eb686d3cc94ba4698547f151c2.tar.xz |
init: Stop indexes on shutdown after ChainStateFlushed callback.
Currently, the latest index state may not be committed to disk on shutdown.
Github-Pull: #17897
Rebased-From: 9dd58ca611f6f2b59c25d727a4e955333525d345
-rw-r--r-- | src/init.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index 543194c2e3..ccb5962c48 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -199,8 +199,6 @@ void Shutdown(InitInterfaces& interfaces) // using the other before destroying them. if (peerLogic) UnregisterValidationInterface(peerLogic.get()); if (g_connman) g_connman->Stop(); - if (g_txindex) g_txindex->Stop(); - ForEachBlockFilterIndex([](BlockFilterIndex& index) { index.Stop(); }); StopTorControl(); @@ -214,8 +212,6 @@ void Shutdown(InitInterfaces& interfaces) peerLogic.reset(); g_connman.reset(); g_banman.reset(); - g_txindex.reset(); - DestroyAllBlockFilterIndexes(); if (::mempool.IsLoaded() && gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) { DumpMempool(::mempool); @@ -248,6 +244,14 @@ void Shutdown(InitInterfaces& interfaces) // CValidationInterface callbacks, flush them... GetMainSignals().FlushBackgroundCallbacks(); + // Stop and delete all indexes only after flushing background callbacks. + if (g_txindex) { + g_txindex->Stop(); + g_txindex.reset(); + } + ForEachBlockFilterIndex([](BlockFilterIndex& index) { index.Stop(); }); + DestroyAllBlockFilterIndexes(); + // Any future callbacks will be dropped. This should absolutely be safe - if // missing a callback results in an unrecoverable situation, unclean shutdown // would too. The only reason to do the above flushes is to let the wallet catch |