mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-25 09:02:00 +00:00
docker: use configs from clickhouse-test (#5531)
* CLICKHOUSE-3887 Debian init: Service stop timeout * clean * clean * docker: use configs from clickhouse-test * clean
This commit is contained in:
parent
42dbb7e881
commit
859b35e0ff
@ -9,7 +9,7 @@ endif ()
|
|||||||
|
|
||||||
install (PROGRAMS clickhouse-test clickhouse-test-server DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
|
install (PROGRAMS clickhouse-test clickhouse-test-server DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
|
||||||
install (
|
install (
|
||||||
DIRECTORY queries performance
|
DIRECTORY queries performance config
|
||||||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse-test
|
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/clickhouse-test
|
||||||
USE_SOURCE_PERMISSIONS
|
USE_SOURCE_PERMISSIONS
|
||||||
COMPONENT clickhouse
|
COMPONENT clickhouse
|
||||||
|
@ -1 +1 @@
|
|||||||
../../docker/test/stateless/decimals_dictionary.xml
|
../../dbms/tests/config/decimals_dictionary.xml
|
@ -1 +1 @@
|
|||||||
../../docker/test/stateless/ints_dictionary.xml
|
../../dbms/tests/config/ints_dictionary.xml
|
@ -1 +1 @@
|
|||||||
../../docker/test/stateless/strings_dictionary.xml
|
../../dbms/tests/config/strings_dictionary.xml
|
@ -30,20 +30,20 @@ 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
|
||||||
|
|
||||||
COPY zookeeper.xml /etc/clickhouse-server/config.d/zookeeper.xml
|
|
||||||
COPY listen.xml /etc/clickhouse-server/config.d/listen.xml
|
|
||||||
COPY part_log.xml /etc/clickhouse-server/config.d/part_log.xml
|
|
||||||
COPY log_queries.xml /etc/clickhouse-server/users.d/log_queries.xml
|
|
||||||
COPY readonly.xml /etc/clickhouse-server/users.d/readonly.xml
|
|
||||||
COPY ints_dictionary.xml /etc/clickhouse-server/ints_dictionary.xml
|
|
||||||
COPY strings_dictionary.xml /etc/clickhouse-server/strings_dictionary.xml
|
|
||||||
COPY decimals_dictionary.xml /etc/clickhouse-server/decimals_dictionary.xml
|
|
||||||
|
|
||||||
CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
|
CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
|
||||||
dpkg -i package_folder/clickhouse-common-static-dbg_*.deb; \
|
dpkg -i package_folder/clickhouse-common-static-dbg_*.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; \
|
||||||
|
ln -s /usr/share/clickhouse-test/config/zookeeper.xml /etc/clickhouse-server/config.d/; \
|
||||||
|
ln -s /usr/share/clickhouse-test/config/listen.xml /etc/clickhouse-server/config.d/; \
|
||||||
|
ln -s /usr/share/clickhouse-test/config/part_log.xml /etc/clickhouse-server/config.d/; \
|
||||||
|
ln -s /usr/share/clickhouse-test/config/log_queries.xml /etc/clickhouse-server/users.d/; \
|
||||||
|
ln -s /usr/share/clickhouse-test/config/readonly.xml /etc/clickhouse-server/users.d/; \
|
||||||
|
ln -s /usr/share/clickhouse-test/config/ints_dictionary.xml /etc/clickhouse-server/; \
|
||||||
|
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; \
|
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'" >> /etc/environment; \
|
||||||
echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; \
|
echo "UBSAN_OPTIONS='print_stacktrace=1'" >> /etc/environment; \
|
||||||
|
@ -1 +0,0 @@
|
|||||||
<yandex><listen_host>::</listen_host></yandex>
|
|
@ -1,7 +0,0 @@
|
|||||||
<yandex>
|
|
||||||
<profiles>
|
|
||||||
<default>
|
|
||||||
<log_queries>1</log_queries>
|
|
||||||
</default>
|
|
||||||
</profiles>
|
|
||||||
</yandex>
|
|
@ -1,8 +0,0 @@
|
|||||||
<yandex>
|
|
||||||
<part_log>
|
|
||||||
<database>system</database>
|
|
||||||
<table>part_log</table>
|
|
||||||
|
|
||||||
<flush_interval_milliseconds>7500</flush_interval_milliseconds>
|
|
||||||
</part_log>
|
|
||||||
</yandex>
|
|
@ -1,16 +0,0 @@
|
|||||||
<yandex>
|
|
||||||
<zookeeper>
|
|
||||||
<node>
|
|
||||||
<host>localhost</host>
|
|
||||||
<port>2181</port>
|
|
||||||
</node>
|
|
||||||
<node>
|
|
||||||
<host>yandex.ru</host>
|
|
||||||
<port>2181</port>
|
|
||||||
</node>
|
|
||||||
<node>
|
|
||||||
<host>111.0.1.2</host>
|
|
||||||
<port>2181</port>
|
|
||||||
</node>
|
|
||||||
</zookeeper>
|
|
||||||
</yandex>
|
|
@ -23,14 +23,14 @@ RUN apt-get update -y \
|
|||||||
|
|
||||||
|
|
||||||
COPY ./stress /stress
|
COPY ./stress /stress
|
||||||
COPY log_queries.xml /etc/clickhouse-server/users.d/log_queries.xml
|
|
||||||
COPY part_log.xml /etc/clickhouse-server/config.d/part_log.xml
|
|
||||||
|
|
||||||
CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
|
CMD dpkg -i package_folder/clickhouse-common-static_*.deb; \
|
||||||
dpkg -i package_folder/clickhouse-common-static-dbg_*.deb; \
|
dpkg -i package_folder/clickhouse-common-static-dbg_*.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; \
|
||||||
|
ln -s /usr/share/clickhouse-test/config/log_queries.xml /etc/clickhouse-server/users.d/; \
|
||||||
|
ln -s /usr/share/clickhouse-test/config/part_log.xml /etc/clickhouse-server/config.d/; \
|
||||||
ln -s /usr/lib/llvm-8/bin/llvm-symbolizer /usr/bin/llvm-symbolizer; \
|
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'" >> /etc/environment; \
|
||||||
echo "TSAN_SYMBOLIZER_PATH=/usr/lib/llvm-8/bin/llvm-symbolizer" >> /etc/environment; \
|
echo "TSAN_SYMBOLIZER_PATH=/usr/lib/llvm-8/bin/llvm-symbolizer" >> /etc/environment; \
|
||||||
|
@ -1,7 +0,0 @@
|
|||||||
<yandex>
|
|
||||||
<profiles>
|
|
||||||
<default>
|
|
||||||
<log_queries>1</log_queries>
|
|
||||||
</default>
|
|
||||||
</profiles>
|
|
||||||
</yandex>
|
|
@ -1,8 +0,0 @@
|
|||||||
<yandex>
|
|
||||||
<part_log>
|
|
||||||
<database>system</database>
|
|
||||||
<table>part_log</table>
|
|
||||||
|
|
||||||
<flush_interval_milliseconds>7500</flush_interval_milliseconds>
|
|
||||||
</part_log>
|
|
||||||
</yandex>
|
|
Loading…
Reference in New Issue
Block a user