chore: clean up sanitizers checks

Author: romange

CMakeLists.txt

@@ -61,8 +61,6 @@ option(DF_USE_SSL "Provide support for SSL connections" ON)
 
 find_package(OpenSSL)
 
-SET(SANITIZERS OFF)
-
 # AFL++ configuration - must be before sanitizer checks
 if(USE_AFL)
   message(STATUS "AFL++ fuzzing mode active")
@@ -91,18 +89,12 @@ option(WITH_ASAN "Enable -fsanitize=address" OFF)
 if (SUPPORT_ASAN AND WITH_ASAN)
   message(STATUS "address sanitizer enabled")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=address")
-  set(SANITIZERS ON)
 endif()
 
 option(WITH_USAN "Enable -fsanitize=undefined" OFF)
 if (SUPPORT_USAN AND WITH_USAN)
   message(STATUS "ub sanitizer enabled")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=undefined")
-  set(SANITIZERS ON)
-endif()
-
-if(SANITIZERS)
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
 endif()
 
 include(third_party)

src/server/CMakeLists.txt

@@ -103,10 +103,6 @@ if (PRINT_STACKTRACES_ON_SIGNAL)
   target_compile_definitions(dragonfly_lib PRIVATE PRINT_STACKTRACES_ON_SIGNAL)
 endif()
 
-if (WITH_ASAN OR WITH_USAN)
-  target_compile_definitions(dfly_transaction PRIVATE SANITIZERS)
-endif()
-
 if (WITH_AWS)
   SET(AWS_LIB awsv2_lib)
   add_definitions(-DWITH_AWS)
@@ -132,10 +128,6 @@ endif()
 add_library(dfly_test_lib test_utils.cc)
 cxx_link(dfly_test_lib dragonfly_lib facade_test gtest_main_ext)
 
-if (WITH_ASAN OR WITH_USAN)
-  target_compile_definitions(dfly_test_lib PRIVATE SANITIZERS)
-endif()
-
 cxx_test(dragonfly_test dfly_test_lib LABELS DFLY)
 cxx_test(multi_test dfly_test_lib LABELS DFLY)
 cxx_test(generic_family_test dfly_test_lib LABELS DFLY)
@@ -162,14 +154,6 @@ cxx_test(cluster/cluster_config_test dfly_test_lib LABELS DFLY)
 cxx_test(cluster/cluster_family_test dfly_test_lib LABELS DFLY)
 cxx_test(acl/acl_family_test dfly_test_lib LABELS DFLY)
 cxx_test(engine_shard_set_test dfly_test_lib LABELS DFLY)
-if (WITH_ASAN OR WITH_USAN)
-  target_compile_definitions(stream_family_test PRIVATE SANITIZERS)
-  target_compile_definitions(multi_test PRIVATE SANITIZERS)
-  target_compile_definitions(search_family_test PRIVATE SANITIZERS)
-  target_compile_definitions(json_family_test PRIVATE SANITIZERS)
-  target_compile_definitions(json_family_memory_test PRIVATE SANITIZERS)
-  target_compile_definitions(dragonfly_test PRIVATE SANITIZERS)
-endif()
 
 add_dependencies(check_dfly dragonfly_test json_family_test list_family_test
                  generic_family_test memcache_parser_test rdb_test journal_test

src/server/dragonfly_test.cc

@@ -491,7 +491,6 @@ TEST_F(DflyEngineTest, OOM) {
   }
 }
 
-#ifndef SANITIZERS
 /// Reproduces the case where items with expiry data were evicted,
 /// and then written with the same key.
 TEST_F(DflyEngineTest, Bug207) {
@@ -561,8 +560,6 @@ TEST_F(DflyEngineTest, StickyEviction) {
   }
 }
 
-#endif
-
 TEST_F(DflyEngineTest, ZeroAllocationEviction) {
   max_memory_limit = 500000;  // 0.5mb
   shard_set->TEST_EnableCacheMode();

src/server/json_family_test.cc

@@ -2567,10 +2567,8 @@ TEST_F(JsonFamilyTest, MGet) {
   resp = Run({"JSON.SET", "json2", ".", json[1]});
   ASSERT_THAT(resp, "OK");
 
-#ifndef SANITIZERS
   resp = Run({"JSON.MGET", "json1", "??INNNNVALID??"});
   EXPECT_THAT(resp, ErrArg("ERR syntax error"));
-#endif
 
   resp = Run({"JSON.MGET", "json1", "json2", "json3", "$.address.country"});
   ASSERT_EQ(RespExpr::ARRAY, resp.type);

src/server/multi_test.cc

@@ -463,7 +463,6 @@ TEST_F(MultiTest, FlushDb) {
 // Triggers a false possitive and therefore we turn it off
 // There seem not to be a good solution to handle these false positives
 // since sanitizers work well with u_context which is *very* slow
-#ifndef SANITIZERS
 TEST_F(MultiTest, Eval) {
   if (auto config = absl::GetFlag(FLAGS_default_lua_flags); config != "") {
     GTEST_SKIP() << "Skipped Eval test because default_lua_flags is set";
@@ -555,7 +554,6 @@ TEST_F(MultiTest, Eval) {
   EXPECT_EQ(resp.GetVec()[0], "0");
   EXPECT_EQ(resp.GetVec()[1].type, RespExpr::Type::ARRAY);
 }
-#endif
 
 TEST_F(MultiTest, Watch) {
   auto kExecFail = ArgType(RespExpr::NIL);
@@ -784,7 +782,6 @@ TEST_F(MultiTest, ExecGlobalFallback) {
   EXPECT_EQ(1, GetMetrics().coordinator_stats.tx_global_cnt);
 }
 
-#ifndef SANITIZERS
 TEST_F(MultiTest, ScriptFlagsCommand) {
   if (auto flags = absl::GetFlag(FLAGS_default_lua_flags); flags != "") {
     GTEST_SKIP() << "Skipped ScriptFlagsCommand test because default_lua_flags is set";
@@ -820,7 +817,6 @@ TEST_F(MultiTest, ScriptFlagsCommand) {
     EXPECT_THAT(Run({"eval", kUndeclared2, "0"}), "works");
   }
 }
-#endif
 
 TEST_F(MultiTest, ScriptFlagsEmbedded) {
   const char* s1 = R"(
@@ -1200,8 +1196,6 @@ TEST_F(MultiEvalTest, MultiSomeEval) {
   EXPECT_THAT(brpop_resp, ArgType(RespExpr::NIL_ARRAY));
 }
 
-// Flaky because of https://github.com/google/sanitizers/issues/1760
-#ifndef SANITIZERS
 TEST_F(MultiEvalTest, ScriptSquashingUknownCmd) {
   absl::FlagSaver fs;
   absl::SetFlag(&FLAGS_lua_auto_async, true);
@@ -1220,7 +1214,6 @@ TEST_F(MultiEvalTest, ScriptSquashingUknownCmd) {
   EXPECT_THAT(Run({"EVAL", s, "1", "A"}), ErrArg("unknown command `SECOND WRONG`"));
   EXPECT_EQ(Run({"get", "A"}), "2");
 }
-#endif
 
 TEST_F(MultiEvalTest, MultiAndEval) {
   // We had a bug in borrowing interpreters which caused a crash in this scenario

src/server/search/search_family_test.cc

@@ -323,8 +323,6 @@ TEST_F(SearchFamilyTest, Stats) {
   EXPECT_LE(metrics.search_stats.used_memory, 3 * expected_usage);
 }
 
-// todo: ASAN fails heres on arm
-#ifndef SANITIZERS
 TEST_F(SearchFamilyTest, Simple) {
   Run({"hset", "d:1", "foo", "baz", "k", "v"});
   Run({"hset", "d:2", "foo", "bar", "k", "v"});
@@ -346,7 +344,6 @@ TEST_F(SearchFamilyTest, Simple) {
   Run({"hset", "w:2", "foo", "this", "k", "v"});
   EXPECT_THAT(Run({"ft.search", "i1", "@foo:this"}), kNoResults);
 }
-#endif
 
 TEST_F(SearchFamilyTest, Errors) {
   Run({"ft.create", "i1", "PREFIX", "1", "d:", "SCHEMA", "foo", "TAG", "bar", "TEXT"});
@@ -419,8 +416,6 @@ TEST_F(SearchFamilyTest, JsonIdentifierWithBrackets) {
   EXPECT_THAT(Run({"ft.search", "i1", "(@continent:{Europe})"}), AreDocIds("k1", "k2"));
 }
 
-// todo: fails on arm build
-#ifndef SANITIZERS
 TEST_F(SearchFamilyTest, JsonArrayValues) {
   string_view D1 = R"(
 {
@@ -495,7 +490,6 @@ TEST_F(SearchFamilyTest, JsonArrayValues) {
   res = Run({"ft.search", "i1", "@name:alex", "return", "1", "::??INVALID??::", "as", "retval"});
   EXPECT_THAT(res, IsMapWithSize("k1", IsMap()));
 }
-#endif
 
 TEST_F(SearchFamilyTest, Tags) {
   Run({"hset", "d:1", "color", "red, green"});
@@ -963,7 +957,6 @@ TEST_F(SearchFamilyTest, FtProfile) {
   ASSERT_ARRAY_OF_TWO_ARRAYS(resp);
 }
 
-#ifndef SANITIZERS
 TEST_F(SearchFamilyTest, FtProfileInvalidQuery) {
   Run({"json.set", "j1", ".", R"({"id":"1"})"});
   Run({"ft.create", "i1", "on", "json", "schema", "$.id", "as", "id", "tag"});
@@ -976,7 +969,6 @@ TEST_F(SearchFamilyTest, FtProfileInvalidQuery) {
   resp = Run({"ft.profile", "i1", "search", "query", "@{invalid13289}"});
   EXPECT_THAT(resp, ErrArg("query syntax error"));
 }
-#endif
 
 TEST_F(SearchFamilyTest, FtProfileErrorReply) {
   Run({"ft.create", "i1", "schema", "name", "text"});
@@ -1286,8 +1278,6 @@ TEST_F(SearchFamilyTest, FlushSearchIndices) {
   EXPECT_THAT(resp, ErrArg("ERR Index already exists"));
 }
 
-// todo: ASAN fails heres on arm
-#ifndef SANITIZERS
 TEST_F(SearchFamilyTest, AggregateWithLoadOptionHard) {
   // Test HASH
   Run({"HSET", "h1", "word", "item1", "foo", "10", "text", "first key"});
@@ -1327,7 +1317,6 @@ TEST_F(SearchFamilyTest, AggregateWithLoadOptionHard) {
   EXPECT_THAT(resp, IsUnordArrayWithSize(IsMap("foo_total", "20", "word", "item2"),
                                          IsMap("foo_total", "10", "word", "item1")));
 }
-#endif
 
 TEST_F(SearchFamilyTest, WrongFieldTypeJson) {
   // Test simple

src/server/stream_family_test.cc

@@ -504,16 +504,13 @@ TEST_F(StreamFamilyTest, XReadGroupEmpty) {
   EXPECT_THAT(resp, ArrLen(2));
 }
 
-// todo: ASAN fails heres on arm
-#ifndef SANITIZERS
 TEST_F(StreamFamilyTest, Issue854) {
   auto resp = Run({"xgroup", "help"});
   EXPECT_THAT(resp, ArgType(RespExpr::ARRAY));
 
   resp = Run({"eval", "redis.call('xgroup', 'help')", "0"});
   EXPECT_THAT(resp, ErrArg("is not allowed"));
 }
-#endif
 
 TEST_F(StreamFamilyTest, XGroupConsumer) {
   Run({"xgroup", "create", "foo", "group", "$", "MKSTREAM"});