thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix arguments in prepareProcessor call.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-07-05 16:03:32 +03:00
parent 02bded6f21
commit 45b7d479aa
5 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmake/tsan-suppressions.txt
View File

@ -21,24 +21,3 @@ race:boost/lockfree/detail/freelist.hpp
race:lockfree/detail/freelist.hpp
race:detail/freelist.hpp
race:freelist.hpp
fun:DB::PipelineExecutor::TaskQueue::push
fun:DB::PipelineExecutor::TaskQueue::pop
src:dbms/src/Processors/Executors/PipelineExecutorTaskQueue.cpp
src:../dbms/src/Processors/Executors/PipelineExecutorTaskQueue.cpp
src:/build/obj-x86_64-linux-gnu/../contrib/boost/boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
src:../contrib/boost/boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
src:contrib/boost/boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
src:boost/boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
src:boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
src:lockfree/detail/tagged_ptr_ptrcompression.hpp
src:detail/tagged_ptr_ptrcompression.hpp
src:tagged_ptr_ptrcompression.hpp
src:/build/obj-x86_64-linux-gnu/../contrib/boost/boost/lockfree/detail/freelist.hpp
src:../contrib/boost/boost/lockfree/detail/freelist.hpp
src:contrib/boost/boost/lockfree/detail/freelist.hpp
src:boost/boost/lockfree/detail/freelist.hpp
src:boost/lockfree/detail/freelist.hpp
src:lockfree/detail/freelist.hpp
src:detail/freelist.hpp
src:freelist.hpp

2
dbms/src/Processors/Executors/PipelineExecutor.cpp
View File

@ -494,7 +494,7 @@ void PipelineExecutor::executeSingleThread(size_t thread_num, size_t)
{
try
{
return prepareProcessor(pid, stack, false, thread_num);
return prepareProcessor(pid, stack, thread_num, false);
}
catch (...)
{

23
dbms/tests/config/tsan-suppressions.txt Normal file
View File

@ -0,0 +1,23 @@
# Wrappers for boost lockfree.
# https://github.com/boostorg/lockfree/issues/22
# https://stackoverflow.com/questions/53996201/boost-lock-free-queue-is-triggering-clangs-thread-sanitizer
race:DB::PipelineExecutor::TaskQueue::push
race:DB::PipelineExecutor::TaskQueue::pop
race:dbms/src/Processors/Executors/PipelineExecutorTaskQueue.cpp
race:../dbms/src/Processors/Executors/PipelineExecutorTaskQueue.cpp
race:/build/obj-x86_64-linux-gnu/../contrib/boost/boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
race:../contrib/boost/boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
race:contrib/boost/boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
race:boost/boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
race:boost/lockfree/detail/tagged_ptr_ptrcompression.hpp
race:lockfree/detail/tagged_ptr_ptrcompression.hpp
race:detail/tagged_ptr_ptrcompression.hpp
race:tagged_ptr_ptrcompression.hpp
race:/build/obj-x86_64-linux-gnu/../contrib/boost/boost/lockfree/detail/freelist.hpp
race:../contrib/boost/boost/lockfree/detail/freelist.hpp
race:contrib/boost/boost/lockfree/detail/freelist.hpp
race:boost/boost/lockfree/detail/freelist.hpp
race:boost/lockfree/detail/freelist.hpp
race:lockfree/detail/freelist.hpp
race:detail/freelist.hpp
race:freelist.hpp

2
docker/test/stateful/Dockerfile
View File

@ -17,7 +17,7 @@ CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
dpkg -i package_folder/clickhouse-client_*.deb; \
dpkg -i package_folder/clickhouse-test_*.deb; \
ln -s /usr/lib/llvm-8/bin/llvm-symbolizer /usr/bin/llvm-symbolizer; \
echo "TSAN_OPTIONS='halt_on_error=1 history_size=7'" >> /etc/environment; \
echo "TSAN_OPTIONS='halt_on_error=1 history_size=7 suppressions=/usr/share/clickhouse-test/config/tsan-suppressions.txt'" >> /etc/environment; \
echo "TSAN_SYMBOLIZER_PATH=/usr/lib/llvm-8/bin/llvm-symbolizer" >> /etc/environment; \
echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; \
echo "ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; \

2
docker/test/stateless/Dockerfile
View File

@ -45,7 +45,7 @@ CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
ln -s /usr/share/clickhouse-test/config/strings_dictionary.xml /etc/clickhouse-server/; \
ln -s /usr/share/clickhouse-test/config/decimals_dictionary.xml /etc/clickhouse-server/; \
ln -s /usr/lib/llvm-8/bin/llvm-symbolizer /usr/bin/llvm-symbolizer; \
echo "TSAN_OPTIONS='halt_on_error=1 history_size=7'" >> /etc/environment; \
echo "TSAN_OPTIONS='halt_on_error=1 history_size=7 suppressions=/usr/share/clickhouse-test/config/tsan-suppressions.txt'" >> /etc/environment; \
echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; \
echo "ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; \
echo "UBSAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/environment; \