Skip to content

Commit e2d5916

Browse files
authored
chore: set wal_keep_size by data disk size (#2372)
1 parent 35193b9 commit e2d5916

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

addons/postgresql/config/pg12-config.tpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,18 @@ min_parallel_table_scan_size = '8MB'
174174

175175
{{- $max_wal_size := min ( max ( div $phy_memory 2097152 ) 4096 ) 32768 }}
176176
{{- $min_wal_size := min ( max ( div $phy_memory 8388608 ) 2048 ) 8192 }}
177+
{{- $wal_keep_segments := 64 }}
177178
{{- $data_disk_size := getComponentPVCSizeByName $.component "data" }}
178-
{{/* if data disk lt 5G , set max_wal_size to 256MB */}}
179+
{{/* if data disk lt 5G , set max_wal_size to 256MB and wal_keep_segments to 8 (128MB) */}}
179180
{{- $disk_min_limit := mul 5 1024 1024 1024 }}
180181
{{- if and ( gt $data_disk_size 0 ) ( lt $data_disk_size $disk_min_limit ) }}
181182
{{- $max_wal_size = 256 }}
182183
{{- $min_wal_size = 64 }}
184+
{{- $wal_keep_segments = 8 }}
183185
{{- end }}
184186
max_wal_size = '{{- printf "%dMB" $max_wal_size }}'
185187
min_wal_size = '{{- printf "%dMB" $min_wal_size }}'
188+
wal_keep_segments = '{{ $wal_keep_segments }}'
186189

187190
old_snapshot_threshold = '-1'
188191
parallel_leader_participation = 'True'
@@ -274,4 +277,3 @@ xmloption = 'content'
274277
## the following parameters have been deprecated in postgresql 14
275278
operator_precedence_warning = 'off'
276279
vacuum_cleanup_index_scale_factor = '0.1'
277-
wal_keep_segments = '96'

addons/postgresql/config/pg14-config.tpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,18 @@ min_parallel_table_scan_size = '8MB'
183183

184184
{{- $max_wal_size := min ( max ( div $phy_memory 2097152 ) 4096 ) 32768 }}
185185
{{- $min_wal_size := min ( max ( div $phy_memory 8388608 ) 2048 ) 8192 }}
186+
{{- $wal_keep_size := 1024 }}
186187
{{- $data_disk_size := getComponentPVCSizeByName $.component "data" }}
187-
{{/* if data disk lt 5G , set max_wal_size to 256MB */}}
188+
{{/* if data disk lt 5G , set max_wal_size to 256MB and wal_keep_size to 128MB */}}
188189
{{- $disk_min_limit := mul 5 1024 1024 1024 }}
189190
{{- if and ( gt $data_disk_size 0 ) ( lt $data_disk_size $disk_min_limit ) }}
190191
{{- $max_wal_size = 256 }}
191192
{{- $min_wal_size = 64 }}
193+
{{- $wal_keep_size = 128 }}
192194
{{- end }}
193195
max_wal_size = '{{- printf "%dMB" $max_wal_size }}'
194196
min_wal_size = '{{- printf "%dMB" $min_wal_size }}'
197+
wal_keep_size = '{{- printf "%dMB" $wal_keep_size }}'
195198

196199
old_snapshot_threshold = '-1'
197200
parallel_leader_participation = 'True'
@@ -311,5 +314,4 @@ remove_temp_files_after_crash = 'on'
311314
track_wal_io_timing = 'False'
312315
vacuum_failsafe_age = '1600000000'
313316
vacuum_multixact_failsafe_age = '1600000000'
314-
wal_keep_size = '1536MB'
315317
wal_skip_threshold = '2048'

addons/postgresql/config/pg15-config.tpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,18 @@ min_parallel_table_scan_size = '8MB'
183183

184184
{{- $max_wal_size := min ( max ( div $phy_memory 2097152 ) 4096 ) 32768 }}
185185
{{- $min_wal_size := min ( max ( div $phy_memory 8388608 ) 2048 ) 8192 }}
186+
{{- $wal_keep_size := 1024 }}
186187
{{- $data_disk_size := getComponentPVCSizeByName $.component "data" }}
187-
{{/* if data disk lt 5G , set max_wal_size to 256MB */}}
188+
{{/* if data disk lt 5G , set max_wal_size to 256MB and wal_keep_size to 128MB */}}
188189
{{- $disk_min_limit := mul 5 1024 1024 1024 }}
189190
{{- if and ( gt $data_disk_size 0 ) ( lt $data_disk_size $disk_min_limit ) }}
190191
{{- $max_wal_size = 256 }}
191192
{{- $min_wal_size = 64 }}
193+
{{- $wal_keep_size = 128 }}
192194
{{- end }}
193195
max_wal_size = '{{- printf "%dMB" $max_wal_size }}'
194196
min_wal_size = '{{- printf "%dMB" $min_wal_size }}'
197+
wal_keep_size = '{{- printf "%dMB" $wal_keep_size }}'
195198

196199
old_snapshot_threshold = '-1'
197200
parallel_leader_participation = 'True'
@@ -311,5 +314,4 @@ remove_temp_files_after_crash = 'on'
311314
track_wal_io_timing = 'False'
312315
vacuum_failsafe_age = '1600000000'
313316
vacuum_multixact_failsafe_age = '1600000000'
314-
wal_keep_size = '1536MB'
315317
wal_skip_threshold = '2048'

addons/postgresql/config/pg16-config.tpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,18 @@ min_parallel_table_scan_size = '8MB'
182182

183183
{{- $max_wal_size := min ( max ( div $phy_memory 2097152 ) 4096 ) 32768 }}
184184
{{- $min_wal_size := min ( max ( div $phy_memory 8388608 ) 2048 ) 8192 }}
185+
{{- $wal_keep_size := 1024 }}
185186
{{- $data_disk_size := getComponentPVCSizeByName $.component "data" }}
186-
{{/* if data disk lt 5G , set max_wal_size to 256MB */}}
187+
{{/* if data disk lt 5G , set max_wal_size to 256MB and wal_keep_size to 128MB */}}
187188
{{- $disk_min_limit := mul 5 1024 1024 1024 }}
188189
{{- if and ( gt $data_disk_size 0 ) ( lt $data_disk_size $disk_min_limit ) }}
189190
{{- $max_wal_size = 256 }}
190191
{{- $min_wal_size = 64 }}
192+
{{- $wal_keep_size = 128 }}
191193
{{- end }}
192194
max_wal_size = '{{- printf "%dMB" $max_wal_size }}'
193195
min_wal_size = '{{- printf "%dMB" $min_wal_size }}'
196+
wal_keep_size = '{{- printf "%dMB" $wal_keep_size }}'
194197

195198
old_snapshot_threshold = '-1'
196199
parallel_leader_participation = 'True'
@@ -307,5 +310,4 @@ remove_temp_files_after_crash = 'on'
307310
track_wal_io_timing = 'False'
308311
vacuum_failsafe_age = '1600000000'
309312
vacuum_multixact_failsafe_age = '1600000000'
310-
wal_keep_size = '1536MB'
311313
wal_skip_threshold = '2048'

addons/postgresql/config/pg17-config.tpl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,18 @@ min_parallel_table_scan_size = '8MB'
174174

175175
{{- $max_wal_size := min ( max ( div $phy_memory 2097152 ) 4096 ) 32768 }}
176176
{{- $min_wal_size := min ( max ( div $phy_memory 8388608 ) 2048 ) 8192 }}
177+
{{- $wal_keep_size := 1024 }}
177178
{{- $data_disk_size := getComponentPVCSizeByName $.component "data" }}
178-
{{/* if data disk lt 5G , set max_wal_size to 256MB */}}
179+
{{/* if data disk lt 5G , set max_wal_size to 256MB and wal_keep_size to 128MB */}}
179180
{{- $disk_min_limit := mul 5 1024 1024 1024 }}
180181
{{- if and ( gt $data_disk_size 0 ) ( lt $data_disk_size $disk_min_limit ) }}
181182
{{- $max_wal_size = 256 }}
182183
{{- $min_wal_size = 64 }}
184+
{{- $wal_keep_size = 128 }}
183185
{{- end }}
184186
max_wal_size = '{{- printf "%dMB" $max_wal_size }}'
185187
min_wal_size = '{{- printf "%dMB" $min_wal_size }}'
188+
wal_keep_size = '{{- printf "%dMB" $wal_keep_size }}'
186189

187190
parallel_leader_participation = 'True'
188191
password_encryption = 'md5'
@@ -293,5 +296,4 @@ remove_temp_files_after_crash = 'on'
293296
track_wal_io_timing = 'False'
294297
vacuum_failsafe_age = '1600000000'
295298
vacuum_multixact_failsafe_age = '1600000000'
296-
wal_keep_size = '1536MB'
297299
wal_skip_threshold = '2048'

0 commit comments

Comments
 (0)