summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/src/sgml/config.sgml3
-rw-r--r--src/backend/utils/misc/guc.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 794aef4e6a..3f6986fc1b 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -5266,7 +5266,8 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
practice. On a heavily loaded server you might want to raise it.
Ideally the setting should exceed your typical transaction time,
so as to improve the odds that a lock will be released before
- the waiter decides to check for deadlock.
+ the waiter decides to check for deadlock. Only superusers can change
+ this setting.
</para>
<para>
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 1c6f197748..6e85cb5335 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -1532,8 +1532,8 @@ static struct config_int ConfigureNamesInt[] =
},
{
- /* This is PGC_SIGHUP so all backends have the same value. */
- {"deadlock_timeout", PGC_SIGHUP, LOCK_MANAGEMENT,
+ /* This is PGC_SUSET to prevent hiding from log_lock_waits. */
+ {"deadlock_timeout", PGC_SUSET, LOCK_MANAGEMENT,
gettext_noop("Sets the time to wait on a lock before checking for deadlock."),
NULL,
GUC_UNIT_MS