From daf7e77a6b432fac116d5842df2eb34f37c8ec1e Mon Sep 17 00:00:00 2001 From: Jay Zhuang <zjay@fb.com> Date: Fri, 23 Jul 2021 15:54:29 -0700 Subject: [PATCH] Disable DistributedMutex test by default (#8584) Summary: DistributedMutex hasn't been used in the code base and enabling `USE_FOLLY_DISTRIBUTED_MUTEX` only runs the mutex tests from third-party lib. So disabling it for now. The implementation may also out of date, should re-sync with folly before using. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8584 Test Plan: CI Reviewed By: ajkr Differential Revision: D29888960 Pulled By: jay-zhuang fbshipit-source-id: 3e75f73386c6ed03efb96a1400258d602a724f17 --- build_tools/build_detect_platform | 3 --- build_tools/fbcode_config_platform007.sh | 2 -- build_tools/fbcode_config_platform009.sh | 2 -- 3 files changed, 7 deletions(-) diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform index 28b21e5a6..1d5138dbf 100755 --- a/build_tools/build_detect_platform +++ b/build_tools/build_detect_platform @@ -189,9 +189,6 @@ EOF COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_IOURING_PRESENT" fi fi - if test -z "$USE_FOLLY_DISTRIBUTED_MUTEX"; then - USE_FOLLY_DISTRIBUTED_MUTEX=1 - fi # PORT_FILES=port/linux/linux_specific.cc ;; SunOS) diff --git a/build_tools/fbcode_config_platform007.sh b/build_tools/fbcode_config_platform007.sh index f7de7fcca..9c8e382e6 100644 --- a/build_tools/fbcode_config_platform007.sh +++ b/build_tools/fbcode_config_platform007.sh @@ -167,6 +167,4 @@ VALGRIND_VER="$VALGRIND_BASE/bin/" LUA_PATH= LUA_LIB= -USE_FOLLY_DISTRIBUTED_MUTEX=1 - export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB diff --git a/build_tools/fbcode_config_platform009.sh b/build_tools/fbcode_config_platform009.sh index 82c85b09c..9308274aa 100644 --- a/build_tools/fbcode_config_platform009.sh +++ b/build_tools/fbcode_config_platform009.sh @@ -168,6 +168,4 @@ VALGRIND_VER="$VALGRIND_BASE/bin/" LUA_PATH= LUA_LIB= -USE_FOLLY_DISTRIBUTED_MUTEX=1 - export CC CXX AR CFLAGS CXXFLAGS EXEC_LDFLAGS EXEC_LDFLAGS_SHARED VALGRIND_VER JEMALLOC_LIB JEMALLOC_INCLUDE CLANG_ANALYZER CLANG_SCAN_BUILD LUA_PATH LUA_LIB