From d3fb51a61082f7722917c258363c8f77a8fa7e0a Mon Sep 17 00:00:00 2001 From: Oleg Loginov Date: Tue, 11 Aug 2020 13:49:56 +0300 Subject: [PATCH] #1837: Fixed TSAN issue in Partition Aware Policy for C++ Cassandra driver. Summary: The TSAN issue is fixed in the latest 2.9.0-yb-8 C++ Cassandra driver. Fixed data race on 'session' pointer in the base policy class: https://github.com/yugabyte/cassandra-cpp-driver/commit/88a0837e43a58c7 Fixed data race in the updating Partitions list timer: https://github.com/yugabyte/cassandra-cpp-driver/commit/bccc76e6af60f513070d71b2cddd9580d0003cd6 Test Plan: ybd tsan --cxx-test integration-tests_cassandra_cpp_driver-test --gtest_filter CppCassandraDriverTest.BatchWriteDuringSoftMemoryLimit Reviewers: mikhail Reviewed By: mikhail Subscribers: yql Differential Revision: https://phabricator.dev.yugabyte.com/D9134 --- build-support/thirdparty_url_centos.txt | 2 +- build-support/thirdparty_url_mac.txt | 2 +- build-support/thirdparty_url_ubuntu.txt | 2 +- src/yb/integration-tests/cassandra_cpp_driver-test.cc | 6 ------ thirdparty | 2 +- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/build-support/thirdparty_url_centos.txt b/build-support/thirdparty_url_centos.txt index 8b72d5feb164..906ac6cd13a8 100644 --- a/build-support/thirdparty_url_centos.txt +++ b/build-support/thirdparty_url_centos.txt @@ -1 +1 @@ -https://github.com/yugabyte/yugabyte-db-thirdparty/releases/download/v20200707012818-49ca690c1f/yugabyte-db-thirdparty-v20200707012818-49ca690c1f-centos.tar.gz +https://github.com/yugabyte/yugabyte-db-thirdparty/releases/download/v20200829090443-f431681041/yugabyte-db-thirdparty-v20200829090443-f431681041-centos.tar.gz diff --git a/build-support/thirdparty_url_mac.txt b/build-support/thirdparty_url_mac.txt index b1707b97c06e..b0b9151891d1 100644 --- a/build-support/thirdparty_url_mac.txt +++ b/build-support/thirdparty_url_mac.txt @@ -1 +1 @@ -https://github.com/yugabyte/yugabyte-db-thirdparty/releases/download/v20200707012649-49ca690c1f/yugabyte-db-thirdparty-v20200707012649-49ca690c1f-macos.tar.gz +https://github.com/yugabyte/yugabyte-db-thirdparty/releases/download/v20200829090320-f431681041/yugabyte-db-thirdparty-v20200829090320-f431681041-macos.tar.gz diff --git a/build-support/thirdparty_url_ubuntu.txt b/build-support/thirdparty_url_ubuntu.txt index 46c28e8322ba..0a26e193db02 100644 --- a/build-support/thirdparty_url_ubuntu.txt +++ b/build-support/thirdparty_url_ubuntu.txt @@ -1 +1 @@ -https://github.com/yugabyte/yugabyte-db-thirdparty/releases/download/v20200709004310-33ee9c909c/yugabyte-db-thirdparty-v20200709004310-33ee9c909c-ubuntu.tar.gz +https://github.com/yugabyte/yugabyte-db-thirdparty/releases/download/v20200829090458-f431681041/yugabyte-db-thirdparty-v20200829090458-f431681041-ubuntu.tar.gz diff --git a/src/yb/integration-tests/cassandra_cpp_driver-test.cc b/src/yb/integration-tests/cassandra_cpp_driver-test.cc index 23510ade49b8..95c9ee29319f 100644 --- a/src/yb/integration-tests/cassandra_cpp_driver-test.cc +++ b/src/yb/integration-tests/cassandra_cpp_driver-test.cc @@ -2063,12 +2063,6 @@ class CppCassandraDriverLowSoftLimitTest : public CppCassandraDriverTest { return {"--memory_limit_soft_percentage=0"s, "--throttle_cql_calls_on_soft_memory_limit=false"s}; } - - bool UsePartitionAwareRouting() override { - // TODO: Disable partition aware routing in this test because of TSAN issue (#1837). - // Should be reenabled when issue is fixed. - return false; - } }; TEST_F_EX(CppCassandraDriverTest, BatchWriteDuringSoftMemoryLimit, diff --git a/thirdparty b/thirdparty index 49ca690c1f51..f43168104105 160000 --- a/thirdparty +++ b/thirdparty @@ -1 +1 @@ -Subproject commit 49ca690c1f5192d66f61c5b8da603f0eb57bce44 +Subproject commit f43168104105617035c97142a1eff17162492977