Skip to content

Commit 6fd5380

Browse files
committed
Do not do checks if checkCPUOverload is disabled
1 parent 002c7df commit 6fd5380

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/Common/ProfileEvents.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,8 @@ Event end() { return END; }
11351135

11361136
bool checkCPUOverload(Int64 os_cpu_busy_time_threshold, double min_ratio, double max_ratio, bool should_throw)
11371137
{
1138+
if ((max_ratio <= 0.0) || (max_ratio <= min_ratio))
1139+
return false;
11381140
double cpu_load = global_counters.getCPUOverload(os_cpu_busy_time_threshold);
11391141

11401142
if (cpu_load > DBL_EPSILON)

src/Core/SettingsChangesHistory.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
7878
{"page_cache_lookahead_blocks", 16, 16, "Made this setting adjustable on a per-query level."},
7979
{"output_format_pretty_glue_chunks", "0", "auto", "A new setting to make Pretty formats prettier."},
8080
{"parallel_hash_join_threshold", 0, 100'000, "New setting"},
81+
{"min_os_cpu_wait_time_ratio_to_throw", 0, 0, "Setting values were changed and backported to 25.4"},
82+
{"max_os_cpu_wait_time_ratio_to_throw", 0, 0, "Setting values were changed and backported to 25.4"},
8183
{"make_distributed_plan", 0, 0, "New experimental setting."},
8284
{"execute_distributed_plan_locally", 0, 0, "New experimental setting."},
8385
{"default_shuffle_join_bucket_count", 8, 8, "New experimental setting."},

0 commit comments

Comments
 (0)