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

pull dongcarl wants to merge 1 commits into bitcoin:master from dongcarl:2022-03-libbitcoinkernel-quick-unloadblockindex-fix changing 1 files +1 −1

dongcarl commented at 9:13 PM on March 8, 2022: member

This was introduced because of a silent merge conflict.
bitcoin-chainstate: Lock cs_main to UnloadBlockIndex
This was introduced because of a silent merge conflict.
7a68fe4831
DrahtBot added the label Utils/log/libs on Mar 8, 2022
promag approved
promag commented at 11:29 PM on March 8, 2022: member

ACK 7a68fe4831787a66986a76306180c7876ecba37f

The lock is required https://github.com/bitcoin/bitcoin/blob/9d22dbe2e15594846b92c629c2d4d972150e2684/src/validation.h#L690
MarcoFalke commented at 7:22 AM on March 9, 2022: member

Can you explain why you mention "CI" in the title? It currently passes on master: https://cirrus-ci.com/task/4780878164393984?logs=ci#L1921
jonatack commented at 8:07 AM on March 9, 2022: member

Hm, curious what changed to cause the conflict, will have a look. Edit answering myself: file src/bitcoin-chainstate.cpp was created in 095aa6ca37b.
MarcoFalke removed the label Utils/log/libs on Mar 9, 2022
MarcoFalke added the label Refactoring on Mar 9, 2022
jonatack commented at 8:26 AM on March 9, 2022: member

Not seeing any thread safety analysis warnings on current master 9d22dbe2e15594846b92c629c2d4d972150e2684 with Debian clang version 13.0.1-3. Retrying with make distclean. Edit: still no warnings.
MarcoFalke commented at 8:41 AM on March 9, 2022: member

@jonatack You'll need ./configure CC=clang CXX=clang++ --enable-experimental-util-chainstate
jonatack commented at 8:48 AM on March 9, 2022: member

@jonatack You'll need ./configure CC=clang CXX=clang++ --enable-experimental-util-chainstate

Thanks! I should/should have reviewed that pull.
jonatack commented at 9:07 AM on March 9, 2022: member

ACK 7a68fe4831787a66986a76306180c7876ecba37f

Updated my configure bash aliases with --enable-experimental-util-chainstate
laanwj merged this on Mar 9, 2022
laanwj closed this on Mar 9, 2022
sidhujag referenced this in commit db4817d694 on Mar 9, 2022
dongcarl commented at 4:52 PM on March 9, 2022: member

Thanks for the review guys!
DrahtBot locked this on Mar 9, 2023

Contributors

Labels