Merge b55b5b6c3d into merged_master (Bitcoin PR #19164)

.travis.yml

@@ -156,7 +156,7 @@ jobs:
 
 # x86_64 Linux (xenial, no depends, only system libs)
     - stage: test
-      name: 'x86_64 Linux  [GOAL: install]  [focal]  [depends, sanitizers: thread (TSan), no wallet, no gui]'
+      name: 'x86_64 Linux  [GOAL: install]  [focal]  [depends, sanitizers: thread (TSan), no gui]'
       # Not enough memory on travis machines, so feature_block is excluded for now
       env: >-
         HOST=x86_64-unknown-linux-gnu

ci/test/00_setup_env_native_tsan.sh

@@ -11,4 +11,4 @@ export DOCKER_NAME_TAG=ubuntu:20.04
 export PACKAGES="clang llvm libc++abi-dev libc++-dev python3-zmq"
 export DEP_OPTS="CC=clang CXX='clang++ -stdlib=libc++'"
 export GOAL="install"
-export BITCOIN_CONFIG="--enable-zmq --disable-wallet --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"
+export BITCOIN_CONFIG="--enable-zmq --with-gui=no CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread CC=clang CXX='clang++ -stdlib=libc++'"

test/sanitizer_suppressions/tsan

@@ -12,17 +12,22 @@ mutex:CConnman::ThreadOpenAddedConnections
 mutex:CConnman::SocketHandler
 mutex:UpdateTip
 mutex:PeerLogicValidation::UpdatedBlockTip
+mutex:g_best_block_mutex
 # race (TODO fix)
 race:CConnman::WakeMessageHandler
 race:CConnman::ThreadMessageHandler
 race:fHaveGenesis
 race:ProcessNewBlock
 race:ThreadImport
+race:WalletBatch::WriteHDChain
 race:zmq::*
 race:bitcoin-qt
 # deadlock (TODO fix)
 deadlock:CConnman::ForNode
+deadlock:CConnman::GetNodeStats
+deadlock:CChainState::ConnectTip
 deadlock:UpdateTip
+deadlock:wallet_tests::CreateWalletFromFile
 
 # WalletBatch (unidentified deadlock)
 deadlock:WalletBatch