Skip to content

Commit 60153ed

Browse files
committed
chore(clickhouse) set internal_replication true and other params about memory
1 parent 934f840 commit 60153ed

7 files changed

Lines changed: 26 additions & 6 deletions

File tree

addons/clickhouse/24/chart/clickhouse/values.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,8 @@ keeper:
278278
defaultConfigurationOverrides: |
279279
<clickhouse>
280280
<timezone>Asia/Shanghai</timezone>
281+
<max_server_memory_usage>{{ printf "%.0f" .Values.MaxServerMemoryUsage }}</max_server_memory_usage>
282+
<merges_mutations_memory_usage_soft_limit>{{ printf "%.0f" .Values.MergesMutationsMemoryUsageSoftLimit }}</merges_mutations_memory_usage_soft_limit>
281283
<!-- Macros -->
282284
<macros>
283285
<shard from_env="CLICKHOUSE_SHARD_ID"></shard>
@@ -294,8 +296,8 @@ defaultConfigurationOverrides: |
294296
<cluster>
295297
{{- $shards := $.Values.shards | int }}
296298
{{- range $shard, $e := until $shards }}
297-
<internal_replication>true</internal_replication>
298299
<shard>
300+
<internal_replication>true</internal_replication>
299301
{{- $replicas := $.Values.replicaCount | int }}
300302
{{- range $i, $_e := until $replicas }}
301303
<replica>
@@ -321,10 +323,13 @@ defaultConfigurationOverrides: |
321323
<server_id from_env="KEEPER_SERVER_ID"></server_id>
322324
<log_storage_path>/drycc/clickhouse/keeper/coordination/log</log_storage_path>
323325
<snapshot_storage_path>/drycc/clickhouse/keeper/coordination/snapshots</snapshot_storage_path>
324-
326+
<max_memory_usage_soft_limit>{{ printf "%.0f" .Values.MaxServerMemoryUsage }}</max_memory_usage_soft_limit>
327+
325328
<coordination_settings>
326329
<operation_timeout_ms>10000</operation_timeout_ms>
327330
<session_timeout_ms>30000</session_timeout_ms>
331+
<max_memory_usage_soft_limit>{{ printf "%.0f" .Values.MergesMutationsMemoryUsageSoftLimit }}</max_memory_usage_soft_limit>
332+
<async_replication>true</async_replication>
328333
<raft_logs_level>trace</raft_logs_level>
329334
</coordination_settings>
330335

addons/clickhouse/24/plans/standard-16c64g1000/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ resources:
2020
memory: 16Gi
2121

2222
persistence:
23-
size: 1000Gi
23+
size: 1000Gi
24+
25+
MaxServerMemoryUsage: 59055800320
26+
MergesMutationsMemoryUsageSoftLimit: 34359738368
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "standard-2c4g20"
22
id: 9866afb5-eeb1-4c89-a6d6-01197ff34bbc
3-
description: "clickhouse standard-2c4g20 plan: Disk 20Gi ,vCPUs 2 , RAM 4G "
3+
description: "clickhouse standard-2c4g20 plan: Disk 20Gi ,vCPUs 2 , RAM 4G , DO NOT USE THIS PLAN, only for test "
44
displayName: "standard-2c4g20"
55
bindable: true
66
maximum_polling_duration: 1800

addons/clickhouse/24/plans/standard-2c4g20/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ resources:
2121

2222
persistence:
2323
size: 20Gi
24+
25+
MaxServerMemoryUsage: 3221225472
26+
MergesMutationsMemoryUsageSoftLimit: 2147483648

addons/clickhouse/24/plans/standard-32c64g12000/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ resources:
2020
memory: 16Gi
2121

2222
persistence:
23-
size: 12000Gi
23+
size: 12000Gi
24+
25+
MaxServerMemoryUsage: 59055800320
26+
MergesMutationsMemoryUsageSoftLimit: 34359738368

addons/clickhouse/24/plans/standard-4c16g100/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ resources:
2121

2222
persistence:
2323
size: 100Gi
24+
25+
MaxServerMemoryUsage: 10737418240
26+
MergesMutationsMemoryUsageSoftLimit: 8589934592

addons/clickhouse/24/plans/standard-8c32g500/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ resources:
2020
memory: 8Gi
2121

2222
persistence:
23-
size: 500Gi
23+
size: 500Gi
24+
25+
MaxServerMemoryUsage: 10737418240
26+
MergesMutationsMemoryUsageSoftLimit: 8589934592

0 commit comments

Comments
 (0)