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

Env variables to init.d file

Browse Source
This commit is contained in:
alesapin 2019-01-16 17:37:44 +03:00
parent 7984e4f8a4
commit ec0e350b5b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/test/stateless/Dockerfile
View File

@ -23,10 +23,6 @@ RUN apt-get update -y \
ENV TZ=Europe/Moscow ENV TZ=Europe/Moscow
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV TSAN_OPTIONS='halt_on_error=1'
ENV UBSAN_OPTIONS='print_stacktrace=1'
ENV ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer
COPY zookeeper.xml /etc/clickhouse-server/config.d/zookeeper.xml COPY zookeeper.xml /etc/clickhouse-server/config.d/zookeeper.xml
COPY listen.xml /etc/clickhouse-server/config.d/listen.xml COPY listen.xml /etc/clickhouse-server/config.d/listen.xml
COPY part_log.xml /etc/clickhouse-server/config.d/part_log.xml COPY part_log.xml /etc/clickhouse-server/config.d/part_log.xml
@ -36,5 +32,8 @@ CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
dpkg -i package_folder/clickhouse-server_*.deb; \ dpkg -i package_folder/clickhouse-server_*.deb; \
dpkg -i package_folder/clickhouse-client_*.deb; \ dpkg -i package_folder/clickhouse-client_*.deb; \
dpkg -i package_folder/clickhouse-test_*.deb; \ dpkg -i package_folder/clickhouse-test_*.deb; \
echo "TSAN_OPTIONS='halt_on_error=1'" >> /etc/init.d/clickhouse-server; \
echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/init.d/clickhouse-server; \
echo "ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/init.d/clickhouse-server; \
service zookeeper start; sleep 5; \ service zookeeper start; sleep 5; \
service clickhouse-server start && sleep 5 && clickhouse-test --shard --zookeeper $SKIP_TESTS_OPTION 2>&1 | tee test_output/test_result.txt service clickhouse-server start && sleep 5 && clickhouse-test --shard --zookeeper $SKIP_TESTS_OPTION 2>&1 | tee test_output/test_result.txt

7
docker/test/stress/Dockerfile
View File

@ -19,10 +19,6 @@ RUN apt-get update -y \
netcat-openbsd \ netcat-openbsd \
telnet telnet
ENV TSAN_OPTIONS='halt_on_error=1'
ENV UBSAN_OPTIONS='print_stacktrace=1'
ENV ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer
COPY ./stress /stress COPY ./stress /stress
COPY log_queries.xml /etc/clickhouse-server/users.d/log_queries.xml COPY log_queries.xml /etc/clickhouse-server/users.d/log_queries.xml
COPY part_log.xml /etc/clickhouse-server/config.d/part_log.xml COPY part_log.xml /etc/clickhouse-server/config.d/part_log.xml
@ -31,4 +27,7 @@ CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
dpkg -i package_folder/clickhouse-server_*.deb; \ dpkg -i package_folder/clickhouse-server_*.deb; \
dpkg -i package_folder/clickhouse-client_*.deb; \ dpkg -i package_folder/clickhouse-client_*.deb; \
dpkg -i package_folder/clickhouse-test_*.deb; \ dpkg -i package_folder/clickhouse-test_*.deb; \
echo "TSAN_OPTIONS='halt_on_error=1'" >> /etc/init.d/clickhouse-server; \
echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/init.d/clickhouse-server; \
echo "ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer" >> /etc/init.d/clickhouse-server; \
service clickhouse-server start && sleep 1 && ./stress --output-folder test_output service clickhouse-server start && sleep 1 && ./stress --output-folder test_output