fix tsan again (#392)

* fix tsan again * suppress libunwind errors * remove one suppression
MisterTea · Feb 10, 2021 · 1f0dd1b · 1f0dd1b
1 parent 72c26d3
commit 1f0dd1b
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 187 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/linux_ci.yml b/.github/workflows/linux_ci.yml
@@ -28,7 +28,7 @@ jobs:
           pushd build
           cmake -DSANITIZE_UNDEFINED=ON ../
           make -j`nproc`
-          ./et-test
+          TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
           rm -Rf build
 
@@ -55,7 +55,7 @@ jobs:
           pushd build
           cmake -DSANITIZE_ADDRESS=ON ../
           make -j`nproc`
-          ./et-test
+          TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
           rm -Rf build
 
@@ -82,7 +82,7 @@ jobs:
           pushd build
           cmake -DSANITIZE_MEMORY=ON ../
           make -j`nproc`
-          ./et-test
+          TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
           rm -Rf build
 
@@ -109,7 +109,7 @@ jobs:
           pushd build
           cmake -DSANITIZE_THREAD=ON -DSANITIZE_LINK_STATIC=ON ../
           make -j`nproc`
-          ./et-test
+          TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
           rm -Rf build
 

diff --git a/.github/workflows/mac_ci.yml b/.github/workflows/mac_ci.yml
@@ -26,7 +26,7 @@ jobs:
           pushd build
           cmake -DSANITIZE_UNDEFINED=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib ../
           make -j`nproc`
-          ./et-test
+          TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
           rm -Rf build
 
@@ -51,7 +51,7 @@ jobs:
           pushd build
           cmake -DSANITIZE_ADDRESS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib ../
           make -j`nproc`
-          ./et-test
+          TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
           rm -Rf build
 
@@ -76,7 +76,7 @@ jobs:
           pushd build
           cmake -DSANITIZE_MEMORY=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib ../
           make -j`nproc`
-          ./et-test
+          TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
           rm -Rf build
 
@@ -101,6 +101,6 @@ jobs:
           pushd build
           cmake -DSANITIZE_THREAD=ON -DSANITIZE_LINK_STATIC=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib ../
           make -j`nproc`
-          ./et-test
+          TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
           popd
           rm -Rf build
diff --git a/deployment/centos.Dockerfile b/deployment/centos.Dockerfile
@@ -24,4 +24,4 @@ RUN mkdir -p EternalTerminal/build
 WORKDIR /root/EternalTerminal/build
 RUN cmake -DFULL_PROTOBUF=ON ..
 RUN make -j`nproc`
-RUN ./et-test
+RUN TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
diff --git a/deployment/fedora/Vagrantfile b/deployment/fedora/Vagrantfile
@@ -109,7 +109,7 @@ Vagrant.configure("2") do |config|
     pushd EternalTerminal/build
     cmake ..
     make -j`nproc`
-    ./et-test
+    TSAN_OPTIONS="suppressions=../test/test_tsan.suppression" ./et-test
     popd
   SHELL
   end

diff --git a/src/base/SocketHandler.hpp b/src/base/SocketHandler.hpp
@@ -41,7 +41,6 @@ class SocketHandler {
 
   template <typename T>
   inline void writeProto(int fd, const T& t, bool timeout) {
-    lock_guard<std::mutex> guard(writeMutex);
     string s;
     if (!t.SerializeToString(&s)) {
       STFATAL << "Serialization of " << t.GetTypeName() << " failed!";
@@ -122,8 +121,6 @@ class SocketHandler {
   virtual vector<int> getActiveSockets() = 0;
 
  protected:
-  // This mutex only exists to remove a tsan error in integration tests
-  mutex writeMutex;
 };
 }  // namespace et
 

diff --git a/test/test_tsan.suppression b/test/test_tsan.suppression
@@ -0,0 +1 @@
+called_from_lib:libunwind.so