Crosscheck, and fix all missing parameters, defaults, etc.

gclough · Mar 27, 2018 · 68359af · 68359af
1 parent 28a6e9c
commit 68359af
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 6 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -406,6 +406,7 @@ postgresql_log_rotation_size:          10MB
 # These are relevant when logging to syslog:
 postgresql_syslog_facility:            "LOCAL0"
 postgresql_syslog_ident:               "postgres"
+silent_mode:                           off        # (<= 9.1)
 postgresql_syslog_sequence_numbers:    on         # (>= 9.6)
 postgresql_syslog_split_messages:      on         # (>= 9.6)
 # This is only relevant when logging to eventlog (win32) (>= 9.2):
@@ -499,6 +500,7 @@ postgresql_log_line_prefix: "%t "
 # log lock waits >= deadlock_timeout
 postgresql_log_lock_waits: off
 postgresql_log_statement:  "none"  # none, ddl, mod, all
+postgresql_log_replication_commands: off
 # log temporary files equal or larger
 postgresql_log_temp_files: -1
 postgresql_log_timezone:   "UTC"
@@ -588,6 +590,7 @@ postgresql_bytea_output: "hex"  # hex, escape
 postgresql_xmlbinary:    "base64"
 postgresql_xmloption:    "content"
 postgresql_gin_fuzzy_search_limit:  0   # (<= 9.2)
+postgresql_gin_pending_list_limit: "4MB"  # (>= 9.5)
 
 
 # - Locale and Formatting -
@@ -651,6 +654,7 @@ postgresql_backslash_quote:             "safe_encoding" # on, off, or safe_encod
 postgresql_default_with_oids:           off
 postgresql_escape_string_warning:       on
 postgresql_lo_compat_privileges:        off
+postgresql_operator_precedence_warning: off  # (>= 9.5)
 postgresql_quote_all_identifiers:       off
 postgresql_sql_inheritance:             on
 postgresql_standard_conforming_strings: on
@@ -662,6 +666,16 @@ postgresql_synchronize_seqscans:        on
 postgresql_transform_null_equals:       off
 
 
+#------------------------------------------------------------------------------
+# CONFIG FILE INCLUDES
+#------------------------------------------------------------------------------
+
+# These options allow settings to be loaded from files other than the
+# default postgresql.conf.
+postgresql_include_dir: "conf.d"               # (>= 9.3)
+postgresql_include_if_exists: "exists.conf"    # (>= 9.3)
+postgresql_include: "special.conf"             # (>= 9.3)
+
 #------------------------------------------------------------------------------
 # ERROR HANDLING
 #------------------------------------------------------------------------------
@@ -672,6 +686,13 @@ postgresql_exit_on_error: off
 postgresql_restart_after_crash: on
 
 
+#------------------------------------------------------------------------------
+# CUSTOMIZED OPTIONS
+#------------------------------------------------------------------------------
+
+postgresql_custom_variable_classes: ""      # (<= 9.1)
+
+
 #------------------------------------------------------------------------------
 # PGTUNE
 #------------------------------------------------------------------------------

diff --git a/templates/crosscheck_parameters.sh b/templates/crosscheck_parameters.sh
@@ -0,0 +1,47 @@
+#!/bin/bash -
+
+#
+# Identify a unique filename
+#
+TEMP_FILE=/tmp/`basename $0`.$$
+
+#
+# Loop through all postgresql.conf.orig files, and compare them to the j2 files
+#
+for FILE in postgresql.conf-[0-9]*\.orig; do
+  #
+  # Extract the base filename, removing ".orig"
+  #
+  BASE_FILE="`echo $FILE | sed s/\.orig\$//`"
+
+  #
+  # If we crash, then cleanup
+  #
+  trap 'rm -f ${TEMP_FILE}.orig ${TEMP_FILE}.j2 ${TEMP_FILE}.defaults' 0
+
+  #
+  # Extract a unique, sorted list of the parameter names
+  #
+  cat ${BASE_FILE}.orig | sed s/\#// | grep ^[a-z] | cut -f1 -d' ' | sort | uniq > ${TEMP_FILE}.orig
+  cat ${BASE_FILE}.j2   | sed s/\#// | grep ^[a-z] | cut -f1 -d' ' | sort | uniq > ${TEMP_FILE}.j2
+  cat ../defaults/main.yml | sed s/\#// | grep ^[a-z] | cut -f1 -d':' | sed s/^postgresql_// | sort | uniq > ${TEMP_FILE}.defaults
+
+  #
+  # Output a comparision
+  #
+  echo ================================================================================
+  echo ${BASE_FILE}.orig ${BASE_FILE}.j2
+  diff ${TEMP_FILE}.orig ${TEMP_FILE}.j2 && echo All parameters exist in both files
+  echo --------------------------------------------------------------------------------
+  echo ${BASE_FILE}.defaults ${BASE_FILE}.j2
+  cat ${TEMP_FILE}.j2 | while read PARAM; do
+    grep ^postgresql_${PARAM}: ../defaults/main.yml > /dev/null 2>&1 || echo "Missing $PARAM in ../defaults/main.yml"
+  done
+  echo ================================================================================
+  echo
+
+  #
+  # Cleanup
+  #
+  rm -f ${TEMP_FILE}.orig ${TEMP_FILE}.j2 ${TEMP_FILE}.defaults
+done
diff --git a/templates/postgresql.conf-9.3.j2 b/templates/postgresql.conf-9.3.j2
@@ -501,6 +501,7 @@ vacuum_multixact_freeze_table_age = {{postgresql_vacuum_multixact_freeze_table_a
 bytea_output = '{{postgresql_bytea_output}}'			# hex, escape
 xmlbinary = '{{postgresql_xmlbinary}}'
 xmloption = '{{postgresql_xmloption}}'
+gin_fuzzy_search_limit = '{{postgresql_gin_fuzzy_search_limit}}'
 
 # - Locale and Formatting -
 

diff --git a/templates/postgresql.conf-9.3.orig b/templates/postgresql.conf-9.3.orig
@@ -81,7 +81,7 @@
 #ssl = off				# (change requires restart)
 #ssl_ciphers = 'DEFAULT:!LOW:!EXP:!MD5:@STRENGTH'	# allowed SSL ciphers
 					# (change requires restart)
-#ssl_renegotiation_limit = 512MB	# amount of data between renegotiations
+#ssl_renegotiation_limit = 0		# amount of data between renegotiations
 #ssl_cert_file = 'server.crt'		# (change requires restart)
 #ssl_key_file = 'server.key'		# (change requires restart)
 #ssl_ca_file = ''			# (change requires restart)
@@ -500,6 +500,7 @@
 #bytea_output = 'hex'			# hex, escape
 #xmlbinary = 'base64'
 #xmloption = 'content'
+#gin_fuzzy_search_limit = 0
 
 # - Locale and Formatting -
 

diff --git a/templates/postgresql.conf-9.4.j2 b/templates/postgresql.conf-9.4.j2
@@ -518,6 +518,7 @@ vacuum_multixact_freeze_table_age = {{postgresql_vacuum_multixact_freeze_table_a
 bytea_output = '{{postgresql_bytea_output}}'			# hex, escape
 xmlbinary = '{{postgresql_xmlbinary}}'
 xmloption = '{{postgresql_xmloption}}'
+gin_fuzzy_search_limit = '{{postgresql_gin_fuzzy_search_limit}}'
 
 # - Locale and Formatting -
 

diff --git a/templates/postgresql.conf-9.4.orig b/templates/postgresql.conf-9.4.orig
@@ -83,7 +83,7 @@
 					# (change requires restart)
 #ssl_prefer_server_ciphers = on		# (change requires restart)
 #ssl_ecdh_curve = 'prime256v1'		# (change requires restart)
-#ssl_renegotiation_limit = 512MB	# amount of data between renegotiations
+#ssl_renegotiation_limit = 0		# amount of data between renegotiations
 #ssl_cert_file = 'server.crt'		# (change requires restart)
 #ssl_key_file = 'server.key'		# (change requires restart)
 #ssl_ca_file = ''			# (change requires restart)
@@ -517,6 +517,7 @@
 #bytea_output = 'hex'			# hex, escape
 #xmlbinary = 'base64'
 #xmloption = 'content'
+#gin_fuzzy_search_limit = 0
 
 # - Locale and Formatting -
 

diff --git a/templates/postgresql.conf-9.5.j2 b/templates/postgresql.conf-9.5.j2
@@ -437,12 +437,20 @@ log_line_prefix = '{{postgresql_log_line_prefix}}'			# special values:
 					# e.g. '<%u%%%d> '
 log_lock_waits = {{'on' if postgresql_log_lock_waits else 'off'}}			# log lock waits >= deadlock_timeout
 log_statement = '{{postgresql_log_statement}}'			# none, ddl, mod, all
+log_replication_commands = {{'on' if postgresql_log_replication_commands else 'off'}}
 log_temp_files = {{postgresql_log_temp_files}}			# log temporary files equal or larger
 					# than the specified size in kilobytes;
 					# -1 disables, 0 logs all temp files
 log_timezone = '{{postgresql_log_timezone}}'
 
 
+# - Process Title -
+
+cluster_name = '{{postgresql_cluster_name}}'			# added to process titles if nonempty
+					# (change requires restart)
+update_process_title = {{'on' if postgresql_update_process_title else 'off'}}
+
+
 #------------------------------------------------------------------------------
 # RUNTIME STATISTICS
 #------------------------------------------------------------------------------
@@ -454,7 +462,6 @@ track_counts = {{'on' if postgresql_track_counts else 'off'}}
 track_io_timing = {{'on' if postgresql_track_io_timing else 'off'}}
 track_functions = {{postgresql_track_functions}}			# none, pl, all
 track_activity_query_size = {{postgresql_track_activity_query_size}}	# (change requires restart)
-update_process_title = {{'on' if postgresql_update_process_title else 'off'}}
 stats_temp_directory = '{{postgresql_stats_temp_directory}}'
 
 
@@ -522,6 +529,8 @@ vacuum_multixact_freeze_table_age = {{postgresql_vacuum_multixact_freeze_table_a
 bytea_output = '{{postgresql_bytea_output}}'			# hex, escape
 xmlbinary = '{{postgresql_xmlbinary}}'
 xmloption = '{{postgresql_xmloption}}'
+gin_fuzzy_search_limit = '{{postgresql_gin_fuzzy_search_limit}}'
+gin_pending_list_limit = '{{postgresql_gin_pending_list_limit}}'
 
 # - Locale and Formatting -
 
@@ -585,6 +594,7 @@ backslash_quote = {{postgresql_backslash_quote}}	# on, off, or safe_encoding
 default_with_oids = {{'on' if postgresql_default_with_oids else 'off'}}
 escape_string_warning = {{'on' if postgresql_escape_string_warning else 'off'}}
 lo_compat_privileges = {{'on' if postgresql_lo_compat_privileges else 'off'}}
+operator_precedence_warning = {{'on' if postgresql_operator_precedence_warning else 'off'}}
 quote_all_identifiers = {{'on' if postgresql_quote_all_identifiers else 'off'}}
 sql_inheritance = {{'on' if postgresql_sql_inheritance else 'off'}}
 standard_conforming_strings = {{'on' if postgresql_standard_conforming_strings else 'off'}}

diff --git a/templates/postgresql.conf-9.6.j2 b/templates/postgresql.conf-9.6.j2
@@ -451,12 +451,20 @@ log_line_prefix = '{{postgresql_log_line_prefix}}'			# special values:
 					# e.g. '<%u%%%d> '
 log_lock_waits = {{'on' if postgresql_log_lock_waits else 'off'}}			# log lock waits >= deadlock_timeout
 log_statement = '{{postgresql_log_statement}}'			# none, ddl, mod, all
+log_replication_commands = {{'on' if postgresql_log_replication_commands else 'off'}}
 log_temp_files = {{postgresql_log_temp_files}}			# log temporary files equal or larger
 					# than the specified size in kilobytes;
 					# -1 disables, 0 logs all temp files
 log_timezone = '{{postgresql_log_timezone}}'
 
 
+# - Process Title -
+
+cluster_name = '{{postgresql_cluster_name}}'			# added to process titles if nonempty
+					# (change requires restart)
+update_process_title = {{'on' if postgresql_update_process_title else 'off'}}
+
+
 #------------------------------------------------------------------------------
 # RUNTIME STATISTICS
 #------------------------------------------------------------------------------
@@ -468,7 +476,6 @@ track_counts = {{'on' if postgresql_track_counts else 'off'}}
 track_io_timing = {{'on' if postgresql_track_io_timing else 'off'}}
 track_functions = {{postgresql_track_functions}}			# none, pl, all
 track_activity_query_size = {{postgresql_track_activity_query_size}}	# (change requires restart)
-update_process_title = {{'on' if postgresql_update_process_title else 'off'}}
 stats_temp_directory = '{{postgresql_stats_temp_directory}}'
 
 
@@ -537,6 +544,8 @@ vacuum_multixact_freeze_table_age = {{postgresql_vacuum_multixact_freeze_table_a
 bytea_output = '{{postgresql_bytea_output}}'			# hex, escape
 xmlbinary = '{{postgresql_xmlbinary}}'
 xmloption = '{{postgresql_xmloption}}'
+gin_fuzzy_search_limit = '{{postgresql_gin_fuzzy_search_limit}}'
+gin_pending_list_limit = '{{postgresql_gin_pending_list_limit}}'
 
 # - Locale and Formatting -
 
@@ -597,6 +606,7 @@ backslash_quote = {{postgresql_backslash_quote}}	# on, off, or safe_encoding
 default_with_oids = {{'on' if postgresql_default_with_oids else 'off'}}
 escape_string_warning = {{'on' if postgresql_escape_string_warning else 'off'}}
 lo_compat_privileges = {{'on' if postgresql_lo_compat_privileges else 'off'}}
+operator_precedence_warning = {{'on' if postgresql_operator_precedence_warning else 'off'}}
 quote_all_identifiers = {{'on' if postgresql_quote_all_identifiers else 'off'}}
 sql_inheritance = {{'on' if postgresql_sql_inheritance else 'off'}}
 standard_conforming_strings = {{'on' if postgresql_standard_conforming_strings else 'off'}}

diff --git a/templates/postgresql.conf-9.6.orig b/templates/postgresql.conf-9.6.orig
@@ -156,7 +156,7 @@
 #bgwriter_delay = 200ms			# 10-10000ms between rounds
 #bgwriter_lru_maxpages = 100		# 0-1000 max buffers written/round
 #bgwriter_lru_multiplier = 2.0		# 0-10.0 multiplier on buffers scanned/round
-#bgwriter_flush_after = 0		# 0 disables,
+#bgwriter_flush_after = 512kB		# 0 disables,
 					# default is 512kB on linux, 0 otherwise
 
 # - Asynchronous Behavior -
@@ -207,7 +207,7 @@
 #max_wal_size = 1GB
 #min_wal_size = 80MB
 #checkpoint_completion_target = 0.5	# checkpoint target duration, 0.0 - 1.0
-#checkpoint_flush_after = 0		# 0 disables,
+#checkpoint_flush_after = 256kB		# 0 disables,
 					# default is 256kB on linux, 0 otherwise
 #checkpoint_warning = 30s		# 0 disables