diff --git a/src/crimson/osd/lsan_suppressions.cc b/src/crimson/osd/lsan_suppressions.cc index 19ad4ece59fb3..648f4a7ada0d0 100644 --- a/src/crimson/osd/lsan_suppressions.cc +++ b/src/crimson/osd/lsan_suppressions.cc @@ -10,7 +10,8 @@ __attribute__((used)) static char kLSanDefaultSuppressions[] = - "leak:InitModule\n"; + "leak:InitModule\n" + "leak:MallocExtension::Initialize\n"; SANITIZER_HOOK_ATTRIBUTE const char *__lsan_default_suppressions() { return kLSanDefaultSuppressions; diff --git a/src/perfglue/CMakeLists.txt b/src/perfglue/CMakeLists.txt index 66e2f2bf96315..9ad73d576e4e5 100644 --- a/src/perfglue/CMakeLists.txt +++ b/src/perfglue/CMakeLists.txt @@ -1,4 +1,4 @@ -if(ALLOCATOR STREQUAL "tcmalloc" AND NOT WITH_SEASTAR) +if(ALLOCATOR STREQUAL "tcmalloc") add_library(heap_profiler STATIC heap_profiler.cc) target_link_libraries(heap_profiler diff --git a/src/test/crimson/CMakeLists.txt b/src/test/crimson/CMakeLists.txt index 6e39d338a4d34..1f9b6208db82f 100644 --- a/src/test/crimson/CMakeLists.txt +++ b/src/test/crimson/CMakeLists.txt @@ -41,7 +41,8 @@ add_executable(test-async-echo target_link_libraries(test-async-echo ceph-common global) add_executable(unittest-seastar-alienstore-thread-pool - test_alienstore_thread_pool.cc) + test_alienstore_thread_pool.cc + ${PROJECT_SOURCE_DIR}/src/crimson/osd/lsan_suppressions.cc) add_ceph_unittest(unittest-seastar-alienstore-thread-pool --memory 256M --smp 1) target_link_libraries(unittest-seastar-alienstore-thread-pool diff --git a/src/test/crimson/seastore/CMakeLists.txt b/src/test/crimson/seastore/CMakeLists.txt index 1f6ddb778d0e1..5c6c2771ce1aa 100644 --- a/src/test/crimson/seastore/CMakeLists.txt +++ b/src/test/crimson/seastore/CMakeLists.txt @@ -40,7 +40,8 @@ target_link_libraries( add_executable(unittest-object-data-handler test_object_data_handler.cc - ../gtest_seastar.cc) + ../gtest_seastar.cc + ${PROJECT_SOURCE_DIR}/src/crimson/osd/lsan_suppressions.cc) add_ceph_unittest(unittest-object-data-handler --memory 256M --smp 1) target_link_libraries( @@ -52,7 +53,8 @@ target_link_libraries( add_executable(unittest-collection-manager test_collection_manager.cc - ../gtest_seastar.cc) + ../gtest_seastar.cc + ${PROJECT_SOURCE_DIR}/src/crimson/osd/lsan_suppressions.cc) add_ceph_test(unittest-collection-manager unittest-collection-manager --memory 256M --smp 1) target_link_libraries(