summaryrefslogtreecommitdiff
path: root/src/backend/utils/misc/postgresql.conf.sample
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-05-02 02:10:33 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2010-05-02 02:10:33 +0000
commitf9ed327f760e7794faecfda54b19515a95ba901d (patch)
tree6e986d2df98e547cc1d2aa44bf71376afada02ba /src/backend/utils/misc/postgresql.conf.sample
parent154163238e933988a9876aac88848258c2da7380 (diff)
Clean up some awkward, inaccurate, and inefficient processing around
MaxStandbyDelay. Use the GUC units mechanism for the value, and choose more appropriate timestamp functions for performing tests with it. Make the ps_activity manipulation in ResolveRecoveryConflictWithVirtualXIDs have behavior similar to ps_activity code elsewhere, notably not updating the display when update_process_title is off and not truncating the display contents at an arbitrarily-chosen length. Improve the docs to be explicit about what MaxStandbyDelay actually measures, viz the difference between primary and standby servers' clocks, and the possible hazards if their clocks aren't in sync.
Diffstat (limited to 'src/backend/utils/misc/postgresql.conf.sample')
-rw-r--r--src/backend/utils/misc/postgresql.conf.sample2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 2ed84127f78..94a4e69c6cb 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -186,7 +186,7 @@
# - Hot Standby -
#hot_standby = off # allows queries during recovery
-#max_standby_delay = 30s # max acceptable lag (s) to allow queries to
+#max_standby_delay = 30s # max acceptable lag to allow queries to
# complete without conflict; -1 means forever
#vacuum_defer_cleanup_age = 0 # num transactions by which cleanup is deferred