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

Merge pull request #66633 from ClickHouse/fix-bad-log-message

Browse Source 
Fix bad log message
This commit is contained in:
Alexey Milovidov 2024-07-19 23:18:42 +00:00 committed by GitHub
commit ed6a1b112e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Common/ZooKeeper/ZooKeeper.cpp
View File

@ -13,14 +13,14 @@
#include <Common/ZooKeeper/Types.h> #include <Common/ZooKeeper/Types.h>
#include <Common/ZooKeeper/ZooKeeperCommon.h> #include <Common/ZooKeeper/ZooKeeperCommon.h>
#include <Common/randomSeed.h> #include <Common/randomSeed.h>
#include <base/find_symbols.h>
#include <base/sort.h> #include <base/sort.h>
#include <base/map.h>
#include <base/getFQDNOrHostName.h> #include <base/getFQDNOrHostName.h>
#include <Core/ServerUUID.h> #include <Core/ServerUUID.h>
#include <Core/BackgroundSchedulePool.h> #include <Core/BackgroundSchedulePool.h>
#include "Common/ZooKeeper/IKeeper.h" #include <Common/ZooKeeper/IKeeper.h>
#include <Common/DNSResolver.h>
#include <Common/StringUtils.h> #include <Common/StringUtils.h>
#include <Common/quoteString.h>
#include <Common/Exception.h> #include <Common/Exception.h>
#include <Interpreters/Context.h> #include <Interpreters/Context.h>
@ -114,7 +114,11 @@ void ZooKeeper::init(ZooKeeperArgs args_, std::unique_ptr<Coordination::IKeeper>
/// availability_zones is empty on server startup or after config reloading /// availability_zones is empty on server startup or after config reloading
/// We will keep the az info when starting new sessions /// We will keep the az info when starting new sessions
availability_zones = args.availability_zones; availability_zones = args.availability_zones;
LOG_TEST(log, "Availability zones from config: [{}], client: {}", fmt::join(availability_zones, ", "), args.client_availability_zone);
LOG_TEST(log, "Availability zones from config: [{}], client: {}",
fmt::join(collections::map(availability_zones, [](auto s){ return DB::quoteString(s); }), ", "),
DB::quoteString(args.client_availability_zone));
if (args.availability_zone_autodetect) if (args.availability_zone_autodetect)
updateAvailabilityZones(); updateAvailabilityZones();
} }

6
tests/queries/0_stateless/02210_processors_profile_log.sql
View File

@ -14,10 +14,12 @@ SELECT
multiIf( multiIf(
-- ExpressionTransform executes sleep(), -- ExpressionTransform executes sleep(),
-- so IProcessor::work() will spend 1 sec. -- so IProcessor::work() will spend 1 sec.
name = 'ExpressionTransform', elapsed_us>=1e6 ? 1 : elapsed_us, -- We use two different timers to measure time: CLOCK_MONOTONIC for sleep and CLOCK_MONOTONIC_COARSE for profiling
-- that's why we cannot compare directly with 1,000,000 microseconds - let's compare with 900,000 microseconds.
name = 'ExpressionTransform', elapsed_us >= 0.9e6 ? 1 : elapsed_us,
-- SourceFromSingleChunk, that feed data to ExpressionTransform, -- SourceFromSingleChunk, that feed data to ExpressionTransform,
-- will feed first block and then wait in PortFull. -- will feed first block and then wait in PortFull.
name = 'SourceFromSingleChunk', output_wait_elapsed_us>=1e6 ? 1 : output_wait_elapsed_us, name = 'SourceFromSingleChunk', output_wait_elapsed_us >= 0.9e6 ? 1 : output_wait_elapsed_us,
-- NullSource/LazyOutputFormatLazyOutputFormat are the outputs -- NullSource/LazyOutputFormatLazyOutputFormat are the outputs
-- so they cannot starts to execute before sleep(1) will be executed. -- so they cannot starts to execute before sleep(1) will be executed.
input_wait_elapsed_us>=1e6 ? 1 : input_wait_elapsed_us) input_wait_elapsed_us>=1e6 ? 1 : input_wait_elapsed_us)