Skip to content

Commit d0af10b

Browse files
robot-clickhouserobot-clickhouse
committed
Backport #80166 to 25.4: Disable CPU overload checks for all tests
1 parent bbea0fa commit d0af10b

File tree

5 files changed

+3
-25
lines changed

5 files changed

+3
-25
lines changed

‎tests/config/install.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,6 @@ ln -sf $SRC_PATH/users.d/nonconst_timezone.xml $DEST_SERVER_PATH/users.d/
136136
ln -sf $SRC_PATH/users.d/allow_introspection_functions.yaml $DEST_SERVER_PATH/users.d/
137137
ln -sf $SRC_PATH/users.d/replicated_ddl_entry.xml $DEST_SERVER_PATH/users.d/
138138
ln -sf $SRC_PATH/users.d/limits.yaml $DEST_SERVER_PATH/users.d/
139-
if check_clickhouse_version 25.4; then
140-
ln -sf $SRC_PATH/users.d/max_cpu_load.xml $DEST_SERVER_PATH/users.d/
141139
fi
142140

143141
if [[ -n "$USE_OLD_ANALYZER" ]] && [[ "$USE_OLD_ANALYZER" -eq 1 ]]; then

‎tests/config/users.d/max_cpu_load.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎tests/integration/helpers/0_common_max_cpu_load.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎tests/integration/helpers/cluster.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4725,8 +4725,6 @@ def write_embedded_config(name, dest_dir, fix_log_level=False):
47254725
if self.with_installed_binary:
47264726
# Ignore CPU overload in this case
47274727
write_embedded_config("0_common_min_cpu_busy_time.xml", self.config_d_dir)
4728-
else:
4729-
write_embedded_config("0_common_max_cpu_load.xml", users_d_dir)
47304728

47314729
use_old_analyzer = os.environ.get("CLICKHOUSE_USE_OLD_ANALYZER") is not None
47324730
use_distributed_plan = (

‎tests/integration/test_settings_profile/test.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -464,22 +464,22 @@ def test_show_profiles():
464464
)
465465

466466
query_expected_response = [
467-
"CREATE SETTINGS PROFILE `default` SETTINGS min_os_cpu_wait_time_ratio_to_throw = 10., max_os_cpu_wait_time_ratio_to_throw = 20.\n",
467+
"CREATE SETTINGS PROFILE `default`\n",
468468
]
469469
assert (
470470
instance.query("SHOW CREATE SETTINGS PROFILE default")
471471
in query_expected_response
472472
)
473473

474474
query_expected_response = [
475-
"CREATE SETTINGS PROFILE `default` SETTINGS min_os_cpu_wait_time_ratio_to_throw = 10., max_os_cpu_wait_time_ratio_to_throw = 20.\n"
475+
"CREATE SETTINGS PROFILE `default`\n"
476476
"CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
477477
"CREATE SETTINGS PROFILE `xyz`\n",
478478
]
479479
assert instance.query("SHOW CREATE PROFILES") in query_expected_response
480480

481481
expected_access = (
482-
"CREATE SETTINGS PROFILE `default` SETTINGS min_os_cpu_wait_time_ratio_to_throw = 10., max_os_cpu_wait_time_ratio_to_throw = 20.\n"
482+
"CREATE SETTINGS PROFILE `default`\n"
483483
"CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
484484
"CREATE SETTINGS PROFILE `xyz`\n"
485485
)

0 commit comments

Comments
 (0)