Merge branch 'master' of github.com:yandex/ClickHouse into numbers-table-function-zero

This commit is contained in:
Alexey Milovidov 2019-02-05 21:13:13 +03:00
commit 9f05ee0267
13 changed files with 58 additions and 7 deletions

View File

@ -39,5 +39,10 @@ add_library(base64 ${LINK_MODE}
${LIBRARY_DIR}/lib/codecs.h
${CMAKE_CURRENT_BINARY_DIR}/config.h)
target_compile_options(base64 PRIVATE ${base64_SSSE3_opt} ${base64_SSE41_opt} ${base64_SSE42_opt} ${base64_AVX_opt} ${base64_AVX2_opt})
set_source_files_properties(${LIBRARY_DIR}/lib/arch/avx/codec.c PROPERTIES COMPILE_FLAGS -mavx)
set_source_files_properties(${LIBRARY_DIR}/lib/arch/avx2/codec.c PROPERTIES COMPILE_FLAGS -mavx2)
set_source_files_properties(${LIBRARY_DIR}/lib/arch/sse41/codec.c PROPERTIES COMPILE_FLAGS -msse4.1)
set_source_files_properties(${LIBRARY_DIR}/lib/arch/sse42/codec.c PROPERTIES COMPILE_FLAGS -msse4.2)
set_source_files_properties(${LIBRARY_DIR}/lib/arch/ssse3/codec.c PROPERTIES COMPILE_FLAGS -mssse3)
target_include_directories(base64 PRIVATE ${LIBRARY_DIR}/include ${CMAKE_CURRENT_BINARY_DIR})

View File

@ -174,7 +174,16 @@ start()
fi
if [ $EXIT_STATUS -eq 0 ]; then
echo "DONE"
attempts=0
while ! is_running && [ $attempts -le 10 ]; do
attempts=$(($attempts + 1))
sleep 1
done
if is_running; then
echo "DONE"
else
echo "UNKNOWN"
fi
else
echo "FAILED"
fi

View File

@ -36,6 +36,8 @@
- [Nagios](https://www.nagios.org/)
- [check_clickhouse](https://github.com/exogroup/check_clickhouse/)
- Logging
- [rsyslog](https://www.rsyslog.com/)
- [omclickhouse](https://www.rsyslog.com/doc/master/configuration/modules/omclickhouse.html)
- [fluentd](https://www.fluentd.org)
- [loghouse](https://github.com/flant/loghouse) (for [Kubernetes](https://kubernetes.io))

View File

@ -1,4 +1,18 @@
# Operations
ClickHouse operations manual consists of the following major sections:
- [Requirements](requirements.md)
- [Monitoring](monitoring.md)
- [Troubleshooting](troubleshooting.md)
- [Usage Recommendations](tips.md)
- [Access Rights](access_rights.md)
- [Data Backup](backup.md)
- [Configuration Files](configuration_files.md)
- [Quotas](quotas.md)
- [System Tables](system_tables.md)
- [Server Configuration Parameters](server_settings/index.md)
- [Settings](settings/index.md)
- [Utilities](utils/index.md)
[Original article](https://clickhouse.yandex/docs/en/operations/) <!--hide-->

View File

@ -37,6 +37,8 @@
- [Nagios](https://www.nagios.org/)
- [check_clickhouse](https://github.com/exogroup/check_clickhouse/)
- ثبت نام
- [rsyslog](https://www.rsyslog.com/)
- [omclickhouse](https://www.rsyslog.com/doc/master/configuration/modules/omclickhouse.html)
- [fluentd](https://www.fluentd.org)
- [loghouse](https://github.com/flant/loghouse) (برای [Kubernetes](https://kubernetes.io))

View File

@ -35,6 +35,8 @@
- [Nagios](https://www.nagios.org/)
- [check_clickhouse](https://github.com/exogroup/check_clickhouse/)
- Логирование
- [rsyslog](https://www.rsyslog.com/)
- [omclickhouse](https://www.rsyslog.com/doc/master/configuration/modules/omclickhouse.html)
- [fluentd](https://www.fluentd.org)
- [loghouse](https://github.com/flant/loghouse) (для [Kubernetes](https://kubernetes.io))

View File

@ -1,3 +1,18 @@
# Эксплуатация
Руководство по эксплуатации ClickHouse состоит из следующих основных разделов:
- [Требования](requirements.md)
- [Мониторинг](monitoring.md)
- [Решение проблем](troubleshooting.md)
- [Советы по эксплуатации](tips.md)
- [Права доступа](access_rights.md)
- [Резервное копирование](backup.md)
- [Конфигурационные файлы](configuration_files.md)
- [Квоты](quotas.md)
- [Системные таблицы](system_tables.md)
- [Конфигурационные параметры сервера](server_settings/index.md)
- [Настройки](settings/index.md)
- [Утилиты](utils/index.md)
[Оригинальная статья](https://clickhouse.yandex/docs/ru/operations/) <!--hide-->

View File

@ -157,7 +157,7 @@ nav:
- 'General Syntax': 'query_language/syntax.md'
- 'Operations':
- 'hidden': 'operations/index.md'
- 'Introduction': 'operations/index.md'
- 'Requirements': 'operations/requirements.md'
- 'Monitoring': 'operations/monitoring.md'
- 'Troubleshooting': 'operations/troubleshooting.md'

View File

@ -157,7 +157,7 @@ nav:
- 'General Syntax': 'query_language/syntax.md'
- 'Operations':
- 'hidden': 'operations/index.md'
- 'Introduction': 'operations/index.md'
- 'Requirements': 'operations/requirements.md'
- 'Monitoring': 'operations/monitoring.md'
- 'Troubleshooting': 'operations/troubleshooting.md'

View File

@ -155,7 +155,7 @@ nav:
- 'Общий синтаксис': 'query_language/syntax.md'
- 'Эксплуатация':
- 'hidden': 'operations/index.md'
- 'Введение': 'operations/index.md'
- 'Требования': 'operations/requirements.md'
- 'Мониторинг': 'operations/monitoring.md'
- 'Решение проблем': 'operations/troubleshooting.md'

View File

@ -156,7 +156,7 @@ nav:
- 'General syntax': 'query_language/syntax.md'
- '运维':
- 'hidden': 'operations/index.md'
- 'Introduction': 'operations/index.md'
- 'Requirements': 'operations/requirements.md'
- 'Monitoring': 'operations/monitoring.md'
- 'Troubleshooting': 'operations/troubleshooting.md'

View File

@ -34,6 +34,8 @@
- [Nagios](https://www.nagios.org/)
- [check_clickhouse](https://github.com/exogroup/check_clickhouse/)
- 记录
- [rsyslog](https://www.rsyslog.com/)
- [omclickhouse](https://www.rsyslog.com/doc/master/configuration/modules/omclickhouse.html)
- [fluentd](https://www.fluentd.org)
- [loghouse](https://github.com/flant/loghouse) (对于 [Kubernetes](https://kubernetes.io))

View File

@ -94,7 +94,7 @@
</div>
<div id="announcement" class="colored-block">
<div class="page">
<a id="announcement-link" href="https://events.yandex.ru/events/ClickHouse/2-feb-2019/" rel="external nofollow" target="_blank">C++ ClickHouse and CatBoost Sprints</a> in Moscow on February 2
Upcoming ClickHouse Community Meetups: <a class="announcement-link" href="https://www.eventbrite.com/e/meetup-clickhouse-in-the-wild-deployment-success-stories-registration-55305051899" rel="external nofollow" target="_blank">San Francisco</a> on February 19 and <a class="announcement-link" href="https://www.eventbrite.com/e/clickhouse-meetup-in-madrid-registration-55376746339" rel="external nofollow" target="_blank">Madrid</a> on April 2
</div>
</div>
<div class="page">