From 61412e7f7492ef08b6efb963f9e64401f0073285 Mon Sep 17 00:00:00 2001 From: Nikita Mikhaylov Date: Tue, 23 Jul 2019 11:22:38 +0300 Subject: [PATCH] changes after review + update config + resolve build fail --- dbms/src/Interpreters/TextLog.cpp | 16 ++++++++-------- dbms/tests/config/text_log.xml | 7 +++++++ docker/test/stateful/Dockerfile | 1 + docker/test/stateful_with_coverage/run.sh | 1 + docker/test/stateless/Dockerfile | 1 + docker/test/stateless_with_coverage/run.sh | 1 + libs/libloggers/loggers/OwnSplitChannel.cpp | 2 +- 7 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 dbms/tests/config/text_log.xml diff --git a/dbms/src/Interpreters/TextLog.cpp b/dbms/src/Interpreters/TextLog.cpp index 884cc4568af..a6d21524c29 100644 --- a/dbms/src/Interpreters/TextLog.cpp +++ b/dbms/src/Interpreters/TextLog.cpp @@ -17,14 +17,14 @@ Block TextLogElement::createBlock() auto priority_datatype = std::make_shared( DataTypeEnum8::Values { - {"FATAL", static_cast(Message::PRIO_FATAL)}, - {"CRITICAL", static_cast(Message::PRIO_CRITICAL)}, - {"ERROR", static_cast(Message::PRIO_ERROR)}, - {"WARNING", static_cast(Message::PRIO_WARNING)}, - {"NOTICE", static_cast(Message::PRIO_NOTICE)}, - {"INFORMATION", static_cast(Message::PRIO_INFORMATION)}, - {"DEBUG", static_cast(Message::PRIO_DEBUG)}, - {"TRACE", static_cast(Message::PRIO_TRACE)} + {"Fatal", static_cast(Message::PRIO_FATAL)}, + {"Critical", static_cast(Message::PRIO_CRITICAL)}, + {"Error", static_cast(Message::PRIO_ERROR)}, + {"Warning", static_cast(Message::PRIO_WARNING)}, + {"Notice", static_cast(Message::PRIO_NOTICE)}, + {"Information", static_cast(Message::PRIO_INFORMATION)}, + {"Debug", static_cast(Message::PRIO_DEBUG)}, + {"Trace", static_cast(Message::PRIO_TRACE)} }); return diff --git a/dbms/tests/config/text_log.xml b/dbms/tests/config/text_log.xml new file mode 100644 index 00000000000..3699a23578c --- /dev/null +++ b/dbms/tests/config/text_log.xml @@ -0,0 +1,7 @@ + + + system + text_log
+ 7500 + + diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile index 466578c8b98..516d63fa330 100644 --- a/docker/test/stateful/Dockerfile +++ b/docker/test/stateful/Dockerfile @@ -19,6 +19,7 @@ CMD dpkg -i package_folder/clickhouse-common-static_*.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/text_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/; \ diff --git a/docker/test/stateful_with_coverage/run.sh b/docker/test/stateful_with_coverage/run.sh index 6ec0bfa155a..6253a07c745 100755 --- a/docker/test/stateful_with_coverage/run.sh +++ b/docker/test/stateful_with_coverage/run.sh @@ -45,6 +45,7 @@ chmod 777 -R /var/log/clickhouse-server/ 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/text_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/; \ diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile index e2cd5eee933..eea48c3c032 100644 --- a/docker/test/stateless/Dockerfile +++ b/docker/test/stateless/Dockerfile @@ -39,6 +39,7 @@ CMD dpkg -i package_folder/clickhouse-common-static_*.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/text_log.xml /etc/clickhouse-server/config.d/; \ ln -s /usr/share/clickhouse-test/config/query_masking_rules.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/; \ diff --git a/docker/test/stateless_with_coverage/run.sh b/docker/test/stateless_with_coverage/run.sh index 50082337757..5d63f9f49d0 100755 --- a/docker/test/stateless_with_coverage/run.sh +++ b/docker/test/stateless_with_coverage/run.sh @@ -47,6 +47,7 @@ chmod 777 -R /var/log/clickhouse-server/ 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/text_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/; \ diff --git a/libs/libloggers/loggers/OwnSplitChannel.cpp b/libs/libloggers/loggers/OwnSplitChannel.cpp index c9f8f5e8bb5..926cf06d09a 100644 --- a/libs/libloggers/loggers/OwnSplitChannel.cpp +++ b/libs/libloggers/loggers/OwnSplitChannel.cpp @@ -63,7 +63,7 @@ void OwnSplitChannel::log(const Poco::Message & msg) elem.thread_name = getThreadName(); elem.thread_number = msg_ext.thread_number; - elem.os_thread_id = msg.getOsTid(); + elem.os_thread_id = CurrentThread::get().os_thread_id; elem.query_id = msg_ext.query_id;