Skip to content

Commit

Permalink
[Chore](asan) set decrementOutputRecursionDepth to suppressions and r…
Browse files Browse the repository at this point in the history
…emove some unu… (apache#18845)

18845
  • Loading branch information
BiteTheDDDDt authored Apr 20, 2023
1 parent c6b1b9d commit 9e64951
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 32 deletions.
1 change: 0 additions & 1 deletion .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ header:
- "**/*.sql"
- "**/*.lock"
- "**/*.out"
- "tsan_suppressions"
- "docs/.markdownlintignore"
- "fe/fe-core/src/test/resources/data/net_snmp_normal"
- "fe/fe-core/src/main/antlr4/org/apache/doris/nereids/JavaLexer.g4"
Expand Down
1 change: 0 additions & 1 deletion .rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,4 @@ condition_variable.*
murmur_hash3.*
utf8_check.cpp
.markdownlintignore
tsan_suppressions
sse2neon.h
1 change: 1 addition & 0 deletions be/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,7 @@ install(FILES
${BASE_DIR}/../conf/be.conf
${BASE_DIR}/../conf/odbcinst.ini
${BASE_DIR}/../conf/asan_suppr.conf
${BASE_DIR}/../conf/lsan_suppr.conf
${BASE_DIR}/../conf/hdfs-site.xml
DESTINATION ${OUTPUT_DIR}/conf)

Expand Down
5 changes: 3 additions & 2 deletions bin/start_be.sh
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,9 @@ export ODBCSYSINI="${DORIS_HOME}/conf"
# support utf8 for oracle database
export NLS_LANG='AMERICAN_AMERICA.AL32UTF8'

#filter known leak for lsan.
export LSAN_OPTIONS="suppressions=${DORIS_HOME}/conf/asan_suppr.conf"
# filter known leak.
export LSAN_OPTIONS="suppressions=${DORIS_HOME}/conf/lsan_suppr.conf"
export ASAN_OPTIONS="suppressions=${DORIS_HOME}/conf/asan_suppr.conf"

while read -r line; do
envline="$(echo "${line}" |
Expand Down
3 changes: 1 addition & 2 deletions conf/asan_suppr.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.

# This is a known leak.
leak:brpc
interceptor_via_lib:apache::thrift
2 changes: 1 addition & 1 deletion conf/be.conf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.

CUR_DATE='$(date +%Y%m%d-%H%M%S)'
CUR_DATE=`date +%Y%m%d-%H%M%S`

PPROF_TMPDIR="$DORIS_HOME/log/"

Expand Down
2 changes: 1 addition & 1 deletion conf/fe.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
## see fe/src/org/apache/doris/common/Config.java
#####################################################################

CUR_DATE='$(date +%Y%m%d-%H%M%S)'
CUR_DATE=`date +%Y%m%d-%H%M%S`

# the output dir of stderr and stdout
LOG_DIR = ${DORIS_HOME}/log
Expand Down
19 changes: 19 additions & 0 deletions conf/lsan_suppr.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

# This is a known leak.
leak:brpc
24 changes: 0 additions & 24 deletions tsan_suppressions

This file was deleted.

0 comments on commit 9e64951

Please sign in to comment.