Merge pull request #16036 from ClickHouse/stress_test_improvemets

Minor improvements of stress test

docker/test/stress/run.sh

@@ -45,7 +45,7 @@ function start()
 # for clickhouse-server (via service)
 echo "ASAN_OPTIONS='malloc_context_size=10 verbosity=1 allocator_release_to_os_interval_ms=10000'" >> /etc/environment
 # for clickhouse-client
-export ASAN_OPTIONS='malloc_context_size=10 verbosity=1 allocator_release_to_os_interval_ms=10000'
+export ASAN_OPTIONS='malloc_context_size=10 allocator_release_to_os_interval_ms=10000'
 
 start
 

docker/test/stress/stress

@@ -28,8 +28,18 @@ def get_options(i):
     options = ""
     if 0 < i:
         options += " --order=random"
+
     if i % 2 == 1:
         options += " --db-engine=Ordinary"
+
+    # If database name is not specified, new database is created for each functional test.
+    # Run some threads with one database for all tests.
+    if i % 3 == 1:
+        options += " --database=test_{}".format(i)
+
+    if i == 13:
+        options += " --client-option='memory_tracker_fault_probability=0.00001'"
+
     return options
 
 

src/Common/Exception.cpp

@@ -2,6 +2,7 @@
 
 #include <string.h>
 #include <cxxabi.h>
+#include <cstdlib>
 #include <Poco/String.h>
 #include <common/logger_useful.h>
 #include <IO/WriteHelpers.h>
@@ -36,13 +37,13 @@ namespace ErrorCodes
 Exception::Exception(const std::string & msg, int code)
     : Poco::Exception(msg, code)
 {
-    // In debug builds, treat LOGICAL_ERROR as an assertion failure.
+    // In debug builds and builds with sanitizers, treat LOGICAL_ERROR as an assertion failure.
     // Log the message before we fail.
-#ifndef NDEBUG
+#ifdef ABORT_ON_LOGICAL_ERROR
     if (code == ErrorCodes::LOGICAL_ERROR)
     {
-        LOG_ERROR(&Poco::Logger::root(), "Logical error: '{}'.", msg);
-        assert(false);
+        LOG_FATAL(&Poco::Logger::root(), "Logical error: '{}'.", msg);
+        abort();
     }
 #endif
 }

src/Common/Exception.h

@@ -10,6 +10,10 @@
 
 #include <fmt/format.h>
 
+#if !defined(NDEBUG) || defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) || defined(MEMORY_SANITIZER) || defined(UNDEFINED_BEHAVIOR_SANITIZER)
+#define ABORT_ON_LOGICAL_ERROR
+#endif
+
 namespace Poco { class Logger; }
 
 

src/Common/tests/gtest_rw_lock.cpp

@@ -131,7 +131,10 @@ TEST(Common, RWLockRecursive)
 
             auto lock2 = fifo_lock->getLock(RWLockImpl::Read, "q2");
 
+#ifndef ABORT_ON_LOGICAL_ERROR
+            /// It throws LOGICAL_ERROR
             EXPECT_ANY_THROW({fifo_lock->getLock(RWLockImpl::Write, "q2");});
+#endif
         }
 
         fifo_lock->getLock(RWLockImpl::Write, "q2");

src/Storages/StorageMergeTree.cpp

@@ -41,6 +41,7 @@ namespace ErrorCodes
     extern const int INCORRECT_DATA;
     extern const int CANNOT_ASSIGN_OPTIMIZE;
     extern const int TIMEOUT_EXCEEDED;
+    extern const int UNKNOWN_POLICY;
 }
 
 namespace ActionLocks
@@ -1331,7 +1332,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
         throw Exception("Destination table " + dest_table_storage->getStorageID().getNameForLogs() +
                        " should have the same storage policy of source table " + getStorageID().getNameForLogs() + ". " +
                        getStorageID().getNameForLogs() + ": " + this->getStoragePolicy()->getName() + ", " +
-                       dest_table_storage->getStorageID().getNameForLogs() + ": " + dest_table_storage->getStoragePolicy()->getName(), ErrorCodes::LOGICAL_ERROR);
+                       dest_table_storage->getStorageID().getNameForLogs() + ": " + dest_table_storage->getStoragePolicy()->getName(), ErrorCodes::UNKNOWN_POLICY);
 
     auto dest_metadata_snapshot = dest_table->getInMemoryMetadataPtr();
     auto metadata_snapshot = getInMemoryMetadataPtr();

src/Storages/StorageReplicatedMergeTree.cpp

@@ -114,6 +114,7 @@ namespace ErrorCodes
     extern const int CANNOT_ASSIGN_ALTER;
     extern const int DIRECTORY_ALREADY_EXISTS;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int UNKNOWN_POLICY;
 }
 
 namespace ActionLocks
@@ -5610,7 +5611,7 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
         throw Exception("Destination table " + dest_table_storage->getStorageID().getNameForLogs() +
                         " should have the same storage policy of source table " + getStorageID().getNameForLogs() + ". " +
                         getStorageID().getNameForLogs() + ": " + this->getStoragePolicy()->getName() + ", " +
-                        getStorageID().getNameForLogs() + ": " + dest_table_storage->getStoragePolicy()->getName(), ErrorCodes::LOGICAL_ERROR);
+                        getStorageID().getNameForLogs() + ": " + dest_table_storage->getStoragePolicy()->getName(), ErrorCodes::UNKNOWN_POLICY);
 
     auto dest_metadata_snapshot = dest_table->getInMemoryMetadataPtr();
     auto metadata_snapshot = getInMemoryMetadataPtr();