diff --git a/contrib/base64-cmake/CMakeLists.txt b/contrib/base64-cmake/CMakeLists.txt index 9357423c992..8ec83201109 100644 --- a/contrib/base64-cmake/CMakeLists.txt +++ b/contrib/base64-cmake/CMakeLists.txt @@ -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}) diff --git a/debian/clickhouse-server.init b/debian/clickhouse-server.init index 2c72d7322d4..28f8481aff7 100755 --- a/debian/clickhouse-server.init +++ b/debian/clickhouse-server.init @@ -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 diff --git a/docs/en/interfaces/third-party/integrations.md b/docs/en/interfaces/third-party/integrations.md index 02ab7ba92a0..76833a869f6 100644 --- a/docs/en/interfaces/third-party/integrations.md +++ b/docs/en/interfaces/third-party/integrations.md @@ -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)) diff --git a/docs/en/operations/index.md b/docs/en/operations/index.md index 63cb19bb639..399a180ec46 100644 --- a/docs/en/operations/index.md +++ b/docs/en/operations/index.md @@ -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/) diff --git a/docs/fa/interfaces/third-party/integrations.md b/docs/fa/interfaces/third-party/integrations.md index 5a648df8f1a..d0b2e041799 100644 --- a/docs/fa/interfaces/third-party/integrations.md +++ b/docs/fa/interfaces/third-party/integrations.md @@ -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)) diff --git a/docs/ru/interfaces/third-party/integrations.md b/docs/ru/interfaces/third-party/integrations.md index 4235add28df..ee9864a16b7 100644 --- a/docs/ru/interfaces/third-party/integrations.md +++ b/docs/ru/interfaces/third-party/integrations.md @@ -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)) diff --git a/docs/ru/operations/index.md b/docs/ru/operations/index.md index f16d6b3f8d7..5e691e81047 100644 --- a/docs/ru/operations/index.md +++ b/docs/ru/operations/index.md @@ -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/) diff --git a/docs/toc_en.yml b/docs/toc_en.yml index 598a0af2d74..f41e94b1a56 100644 --- a/docs/toc_en.yml +++ b/docs/toc_en.yml @@ -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' diff --git a/docs/toc_fa.yml b/docs/toc_fa.yml index f911c9850ec..16a4b2f729f 100644 --- a/docs/toc_fa.yml +++ b/docs/toc_fa.yml @@ -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' diff --git a/docs/toc_ru.yml b/docs/toc_ru.yml index 6f3ab12be4b..3b588f37896 100644 --- a/docs/toc_ru.yml +++ b/docs/toc_ru.yml @@ -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' diff --git a/docs/toc_zh.yml b/docs/toc_zh.yml index d9cc2e77054..ed4f3da3fe2 100644 --- a/docs/toc_zh.yml +++ b/docs/toc_zh.yml @@ -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' diff --git a/docs/zh/interfaces/third-party/integrations.md b/docs/zh/interfaces/third-party/integrations.md index 1a42b45b901..6c77f6bb1e7 100644 --- a/docs/zh/interfaces/third-party/integrations.md +++ b/docs/zh/interfaces/third-party/integrations.md @@ -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)) diff --git a/website/index.html b/website/index.html index 0fd3cc40d33..aa809a67210 100644 --- a/website/index.html +++ b/website/index.html @@ -94,7 +94,7 @@
- C++ ClickHouse and CatBoost Sprints in Moscow on February 2 + Upcoming ClickHouse Community Meetups: San Francisco on February 19 and Madrid on April 2