try to fix

This commit is contained in:
Han Fei 2023-05-02 00:05:36 +02:00
parent 4d18a4f8d3
commit d608ba41e7
8 changed files with 14 additions and 25 deletions

View File

@ -407,6 +407,8 @@ if ((NOT OS_LINUX AND NOT OS_ANDROID) OR (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG"))
set(ENABLE_GWP_ASAN OFF)
endif ()
option (ENABLE_FIU "Enable Fiu" ON)
option(WERROR "Enable -Werror compiler option" ON)
if (WERROR)

View File

@ -1,3 +1,8 @@
if (NOT ENABLE_FIU)
message (STATUS "Not using gwp-asan")
return ()
endif ()
set(FIU_DIR "${ClickHouse_SOURCE_DIR}/contrib/libfiu/")
set(FIU_SOURCES
@ -10,7 +15,7 @@ set(FIU_SOURCES
set(FIU_HEADERS "${FIU_DIR}/libfiu")
add_library(fiu ${FIU_SOURCES})
target_compile_definitions(fiu PUBLIC DUMMY_BACKTRACE)
target_include_directories(fiu PUBLIC ${FIU_HEADERS})
add_library(ch_contrib::fiu ALIAS fiu)
add_library(_fiu ${FIU_SOURCES})
target_compile_definitions(_fiu PUBLIC DUMMY_BACKTRACE)
target_include_directories(_fiu PUBLIC ${FIU_HEADERS})
add_library(ch_contrib::fiu ALIAS _fiu)

View File

@ -147,6 +147,7 @@ function clone_submodules
contrib/xxHash
contrib/simdjson
contrib/liburing
contrib/libfiu
)
git submodule sync

View File

@ -1,8 +1,5 @@
#include <Common/Exception.h>
#include <Common/FailPoint.h>
#include <Poco/StringTokenizer.h>
#include <Poco/Util/LayeredConfiguration.h>
#include <Common/logger_useful.h>
#include <boost/core/noncopyable.hpp>
#include <condition_variable>
@ -28,7 +25,6 @@ static struct InitFiu
#endif
#define APPLY_FOR_FAILPOINTS_ONCE(M) \
M(rmt_commit_zk_fail_before_op) \
M(rmt_commit_zk_fail_after_op)
#define APPLY_FOR_FAILPOINTS(M) \

View File

@ -86,7 +86,6 @@ class ZooKeeperWithFaultInjection
}
public:
using Ptr = std::shared_ptr<ZooKeeperWithFaultInjection>;
static ZooKeeperWithFaultInjection::Ptr createInstance(

View File

@ -140,7 +140,6 @@ enum class SystemQueryTargetType
Expected & expected)
{
String cluster_str;
if (ParserKeyword{"ON"}.ignore(pos, expected))
{
if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))

View File

@ -23,7 +23,6 @@ namespace DB
namespace FailPoints
{
extern const char rmt_commit_zk_fail_before_op[];
extern const char rmt_commit_zk_fail_after_op[];
}
@ -947,15 +946,6 @@ std::vector<String> ReplicatedMergeTreeSinkImpl<async_insert>::commitPart(
ThreadFuzzer::maybeInjectSleep();
fiu_do_on(FailPoints::rmt_commit_zk_fail_before_op,
{
if (!zookeeper->fault_policy)
{
zookeeper->logger = log;
zookeeper->fault_policy = std::make_unique<RandomFaultInjection>(0, 0);
}
zookeeper->fault_policy->must_fail_before_op = true;
});
fiu_do_on(FailPoints::rmt_commit_zk_fail_after_op,
{
if (!zookeeper->fault_policy)

View File

@ -1,7 +1,5 @@
-- Tags: zookeeper
system enable failpoint rmt_commit_zk_fail_before_op;
DROP TABLE IF EXISTS t_hardware_error NO DELAY;
CREATE TABLE t_hardware_error (
@ -9,11 +7,8 @@ CREATE TABLE t_hardware_error (
) Engine = ReplicatedMergeTree('/clickhouse/tables/{shard}/{database}/t_async_insert_dedup', '{replica}')
ORDER BY (KeyID);
-- should not report errors because we retry on hardware_error
insert into t_hardware_error values (1), (2), (3), (4), (5);
system disable failpoint rmt_commit_zk_fail_before_op;
system enable failpoint rmt_commit_zk_fail_after_op;
insert into t_hardware_error values (6), (7), (8), (9), (10);
@ -21,3 +16,5 @@ insert into t_hardware_error values (6), (7), (8), (9), (10);
select count() from t_hardware_error;
system disable failpoint rmt_commit_zk_fail_after_op;
DROP TABLE t_hardware_error NO DELAY;