Merge pull request #19 from misdoro/configurable_max_standby_archive_…

…delay Enable configuring max_standby_archive_delay
trainline-eu · Jan 15, 2021 · 17a9a7d · 17a9a7d
2 parents 9c86b2c + 6ff0b87
commit 17a9a7d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/templates/postgresql.10.conf.j2 b/templates/postgresql.10.conf.j2
@@ -296,7 +296,7 @@ max_replication_slots = {{ postgres_max_replication_slots }} # max number of rep
 
 hot_standby = on			# "off" disallows queries during recovery
 					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
+max_standby_archive_delay = {{ postgres_extra_config.max_standby_archive_delay | default('30s') }} # max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
 max_standby_streaming_delay = {{ postgres_extra_config.max_standby_streaming_delay | default('600s') }}	# max delay before canceling queries

diff --git a/templates/postgresql.11.conf.j2 b/templates/postgresql.11.conf.j2
@@ -297,7 +297,7 @@ max_replication_slots = {{ postgres_max_replication_slots }} # max number of rep
 
 hot_standby = on			# "off" disallows queries during recovery
 					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
+max_standby_archive_delay = {{ postgres_extra_config.max_standby_archive_delay | default('30s') }} # max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
 max_standby_streaming_delay = {{ postgres_extra_config.max_standby_streaming_delay | default('600s') }}	# max delay before canceling queries

diff --git a/templates/postgresql.12.conf.j2 b/templates/postgresql.12.conf.j2
@@ -373,7 +373,7 @@ promote_trigger_file = '/var/lib/postgresql/{{ postgres_version }}/{{ postgres_c
 {% endif %}
 hot_standby = on			# "off" disallows queries during recovery
 					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
+max_standby_archive_delay = {{ postgres_extra_config.max_standby_archive_delay | default('30s') }} # max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
 max_standby_streaming_delay = {{ postgres_extra_config.max_standby_streaming_delay | default('600s') }}	# max delay before canceling queries

diff --git a/templates/postgresql.9.1.conf.j2 b/templates/postgresql.9.1.conf.j2
@@ -236,11 +236,10 @@ synchronous_commit = off		# synchronization level;
 
 #hot_standby = off			# "on" allows queries during recovery
 					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
+max_standby_archive_delay = {{ postgres_extra_config.max_standby_archive_delay | default('30s') }} # max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
-max_standby_streaming_delay = 600s
-#max_standby_streaming_delay = 30s	# max delay before canceling queries
+max_standby_streaming_delay = {{ postgres_extra_config.max_standby_streaming_delay | default('600s') }} # max delay before canceling queries
 					# when reading streaming WAL;
 					# -1 allows indefinite delay
 #wal_receiver_status_interval = 10s	# send replies at least this often

diff --git a/templates/postgresql.9.4.conf.j2 b/templates/postgresql.9.4.conf.j2
@@ -267,7 +267,7 @@ max_replication_slots = {{ postgres_max_replication_slots }} # max number of rep
 
 hot_standby = on			# "on" allows queries during recovery
 					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
+max_standby_archive_delay = {{ postgres_extra_config.max_standby_archive_delay | default('30s') }} # max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
 max_standby_streaming_delay = {{ postgres_extra_config.max_standby_streaming_delay | default('600s') }}	# max delay before canceling queries

diff --git a/templates/postgresql.9.5.conf.j2 b/templates/postgresql.9.5.conf.j2
@@ -285,7 +285,7 @@ max_replication_slots = {{ postgres_max_replication_slots }} # max number of rep
 
 hot_standby = on			# "on" allows queries during recovery
 					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
+max_standby_archive_delay = {{ postgres_extra_config.max_standby_archive_delay | default('30s') }} # max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
 max_standby_streaming_delay = {{ postgres_extra_config.max_standby_streaming_delay | default('600s') }}	# max delay before canceling queries

diff --git a/templates/postgresql.9.6.conf.j2 b/templates/postgresql.9.6.conf.j2
@@ -297,7 +297,7 @@ max_replication_slots = {{ postgres_max_replication_slots }} # max number of rep
 
 hot_standby = on			# "on" allows queries during recovery
 					# (change requires restart)
-#max_standby_archive_delay = 30s	# max delay before canceling queries
+max_standby_archive_delay = {{ postgres_extra_config.max_standby_archive_delay | default('30s') }} # max delay before canceling queries
 					# when reading WAL from archive;
 					# -1 allows indefinite delay
 max_standby_streaming_delay = 600s	# max delay before canceling queries