Skip to content

Commit 92bb69e

Browse files
authored
Merge pull request ClickHouse#63470 from Algunenano/stress_constraints
Extra constraints for stress and fuzzer tests
2 parents da365ef + 463f95e commit 92bb69e

File tree

2 files changed

+34
-1
lines changed

2 files changed

+34
-1
lines changed

docker/test/fuzzer/query-fuzzer-tweaks-users.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<allow_experimental_analyzer>
3232
<readonly/>
3333
</allow_experimental_analyzer>
34+
35+
<!-- This feature is broken, deprecated and will be removed. We don't want more reports about it -->
36+
<allow_experimental_object_type>
37+
<readonly/>
38+
</allow_experimental_object_type>
3439
</constraints>
3540
</default>
3641
</profiles>

docker/test/stateless/stress_tests.lib

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,41 @@ EOL
120120

121121
local max_users_mem
122122
max_users_mem=$((total_mem*30/100)) # 30%
123+
# Similar to docker/test/fuzzer/query-fuzzer-tweaks-users.xml
123124
echo "Setting max_memory_usage_for_user=$max_users_mem and max_memory_usage for queries to 10G"
124-
cat > /etc/clickhouse-server/users.d/max_memory_usage_for_user.xml <<EOL
125+
cat > /etc/clickhouse-server/users.d/stress_test_tweaks-users.xml <<EOL
125126
<clickhouse>
126127
<profiles>
127128
<default>
129+
<max_execution_time>60</max_execution_time>
128130
<max_memory_usage>10G</max_memory_usage>
129131
<max_memory_usage_for_user>${max_users_mem}</max_memory_usage_for_user>
132+
133+
<table_function_remote_max_addresses>200</table_function_remote_max_addresses>
134+
135+
<constraints>
136+
<max_execution_time>
137+
<max>60</max>
138+
</max_execution_time>
139+
140+
<max_memory_usage>
141+
<max>10G</max>
142+
</max_memory_usage>
143+
144+
<table_function_remote_max_addresses>
145+
<max>200</max>
146+
</table_function_remote_max_addresses>
147+
148+
<!-- Don't waste cycles testing the old interpreter. Spend time in the new analyzer instead -->
149+
<allow_experimental_analyzer>
150+
<readonly/>
151+
</allow_experimental_analyzer>
152+
153+
<!-- This feature is broken, deprecated and will be removed. We don't want more reports about it -->
154+
<allow_experimental_object_type>
155+
<readonly/>
156+
</allow_experimental_object_type>
157+
</constraints>
130158
</default>
131159
</profiles>
132160
</clickhouse>

0 commit comments

Comments
 (0)