diff options
| author | Alison Felizzi <alison.felizzi@mongodb.com> | 2021-10-21 05:49:10 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-10-21 06:13:15 +0000 |
| commit | 16d4013b9dc4ad4814a1b586278ebb7e95e340c6 (patch) | |
| tree | 1ea1d7714575d9e7737843c62e0f74e1ac9f0a0e | |
| parent | a5bf23c653053417fe3ed9a37f86d35980487881 (diff) | |
| download | mongo-16d4013b9dc4ad4814a1b586278ebb7e95e340c6.tar.gz | |
Import wiredtiger: 9153261cf8e28326cf3b2075fa5ffd97ee30110d from branch mongodb-master
ref: 406b326af9..9153261cf8
for: 5.2.0
WT-8194 Fix ASAN leaks when tcmalloc is enabled
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rwxr-xr-x | src/third_party/wiredtiger/test/evergreen.yml | 8 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/evergreen/asan_leaks.supp | 3 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/utility/misc.c | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index e21068e5c47..078731c3445 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "406b326af98106648a902f3ca047b2b0dfe55e77" + "commit": "9153261cf8e28326cf3b2075fa5ffd97ee30110d" } diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index ea38ecbe86a..359858dec97 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -3182,18 +3182,20 @@ buildvariants: --enable-strict --enable-diagnostic --disable-static + --enable-tcmalloc --prefix=$(pwd)/LOCAL_INSTALL smp_command: -j $(grep -c ^processor /proc/cpuinfo) make_command: PATH=/opt/mongodbtoolchain/v3/bin:$PATH make test_env_vars: + top_dir=$(git rev-parse --show-toplevel) + top_builddir=$top_dir/build_posix ASAN_OPTIONS="detect_leaks=1:abort_on_error=1:disable_coredump=0" + LSAN_OPTIONS="print_suppressions=0:suppressions=$top_dir/test/evergreen/asan_leaks.supp" ASAN_SYMBOLIZER_PATH=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer TESTUTIL_BYPASS_ASAN=1 LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libeatmydata.so PATH=/opt/mongodbtoolchain/v3/bin:$PATH - top_dir=$(git rev-parse --show-toplevel) - top_builddir=$top_dir/build_posix - LD_LIBRARY_PATH=$top_builddir/.libs + LD_LIBRARY_PATH=$top_builddir/.libs:$top_dir/TCMALLOC_LIB/lib tasks: - name: ".pull_request !.windows_only !.pull_request_compilers !.python" - name: examples-c-test diff --git a/src/third_party/wiredtiger/test/evergreen/asan_leaks.supp b/src/third_party/wiredtiger/test/evergreen/asan_leaks.supp new file mode 100644 index 00000000000..7b2133bf1f9 --- /dev/null +++ b/src/third_party/wiredtiger/test/evergreen/asan_leaks.supp @@ -0,0 +1,3 @@ +# TCMalloc intentionally leaks newed objects. More information can be found in +# https://github.com/gperftools/gperftools/issues/758. +leak:InitModule diff --git a/src/third_party/wiredtiger/test/utility/misc.c b/src/third_party/wiredtiger/test/utility/misc.c index c39b189a634..4826a0b02ff 100644 --- a/src/third_party/wiredtiger/test/utility/misc.c +++ b/src/third_party/wiredtiger/test/utility/misc.c @@ -327,7 +327,7 @@ testutil_is_flag_set(const char *flag) */ flag_being_set = res[0] != '0'; - free((void *)res); + __wt_free(NULL, res); return (flag_being_set); } |