Merge pull request #63039 from azat/tsan-suppressions-fix

Fix suppressions for librdkafka data-race for statistics code

cmake/sanitize.cmake

@@ -8,9 +8,6 @@ option (SANITIZE "Enable one of the code sanitizers" "")
 
 set (SAN_FLAGS "${SAN_FLAGS} -g -fno-omit-frame-pointer -DSANITIZER")
 
-# It's possible to pass an ignore list to sanitizers (-fsanitize-ignorelist). Intentionally not doing this because
-# 1. out-of-source suppressions are awkward 2. it seems ignore lists don't work after the Clang v16 upgrade (#49829)
-
 if (SANITIZE)
     if (SANITIZE STREQUAL "address")
         set (ASAN_FLAGS "-fsanitize=address -fsanitize-address-use-after-scope")

tests/tsan_ignorelist.txt

@@ -3,8 +3,13 @@
 #  [1]: https://clang.llvm.org/docs/SanitizerSpecialCaseList.html
 #  [2]: https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions
 #
-
+# Caveats for generic entry "fun":
+# - does not work for __attribute__((__always_inline__))
+# - requires asterisk at the beginning *and* end for static functions
+#
+[thread]
 # https://github.com/ClickHouse/ClickHouse/issues/55629
 fun:rd_kafka_broker_set_nodename
 # https://github.com/ClickHouse/ClickHouse/issues/60443
-fun:rd_kafka_stats_emit_all
+fun:*rd_avg_calc*
+fun:*rd_avg_rollover*

tests/ubsan_ignorelist.txt

@@ -6,7 +6,12 @@
 # See also [3] for all UBSan checks.
 #
 #   [3]: https://github.com/llvm-mirror/compiler-rt/blob/master/lib/ubsan/ubsan_checks.inc
-
+#
+# Caveats for generic entry "fun":
+# - does not work for __attribute__((__always_inline__))
+# - requires asterisk at the beginning *and* end for static functions
+#
+[undefined]
 # Some value is outside the range of representable values of type 'long' on user-provided data inside boost::geometry - ignore.
 src:*/Functions/pointInPolygon.cpp
 src:*/contrib/boost/boost/geometry/*