From 736c6dc59fe1f860f3076e18efee07180c8eb510 Mon Sep 17 00:00:00 2001 From: cheng-chang <57096775+cheng-chang@users.noreply.github.com> Date: Sun, 27 Dec 2020 16:16:55 -0800 Subject: [PATCH] Disable BasicLockEscalation if cannot determine whether TSAN is enabled (#7814) Summary: BasicLockEscalation will cause false-positive warnings under TSAN (this is a known issue in TSAN, see details in https://gist.github.com/spetrunia/77274cf2d5848e0a7e090d622695ed4e), skip this test if TSAN is enabled, or if we are not sure whether TSAN is enabled. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7814 Test Plan: watch the tsan contrun test to pass. Reviewed By: zhichao-cao Differential Revision: D25708094 Pulled By: cheng-chang fbshipit-source-id: 4fc813ff373301d033d086154cc7bb60a5e95889 --- utilities/transactions/lock/range/range_locking_test.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utilities/transactions/lock/range/range_locking_test.cc b/utilities/transactions/lock/range/range_locking_test.cc index 458ba4524..43110fba4 100644 --- a/utilities/transactions/lock/range/range_locking_test.cc +++ b/utilities/transactions/lock/range/range_locking_test.cc @@ -220,6 +220,8 @@ TEST_F(RangeLockingTest, MultipleTrxLockStatusData) { #if __has_feature(thread_sanitizer) #define SKIP_LOCK_ESCALATION_TEST 1 #endif +#else +#define SKIP_LOCK_ESCALATION_TEST 1 #endif #ifndef SKIP_LOCK_ESCALATION_TEST