Merge bitcoin/bitcoin#24507: fix CI: bitcoin-chainstate: Lock cs_main to UnloadBlockIndex

laanwj · laanwj · commit 05e5af5a6c88 · 2022-03-09T11:16:50.000+01:00
7a68fe4 bitcoin-chainstate: Lock cs_main to UnloadBlockIndex (Carl Dong) Pull request description: This was introduced because of a silent merge conflict. ACKs for top commit: promag: ACK 7a68fe4 jonatack: ACK 7a68fe4 Tree-SHA512: 4c135efd68604452485a129e731675ff5917c157a70c77dd702211d9902c21b3b29380a881723f43ecba4762bc864b036881bb502b3b792e581565dcaa7a7ed4
diff --git a/src/bitcoin-chainstate.cpp b/src/bitcoin-chainstate.cpp
@@ -256,7 +256,7 @@ int main(int argc, char* argv[])
     }
     GetMainSignals().UnregisterBackgroundSignalScheduler();
 
-    UnloadBlockIndex(nullptr, chainman);
+    WITH_LOCK(::cs_main, UnloadBlockIndex(nullptr, chainman));
 
     init::UnsetGlobals();
 }

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ int main(int argc, char* argv[])`
`256`	`256`	`}`
`257`	`257`	`GetMainSignals().UnregisterBackgroundSignalScheduler();`
`258`	`258`
`259`		`- UnloadBlockIndex(nullptr, chainman);`
	`259`	`+ WITH_LOCK(::cs_main, UnloadBlockIndex(nullptr, chainman));`
`260`	`260`
`261`	`261`	`init::UnsetGlobals();`
`262`	`262`	`}`