Improve documentation and GUC description for transaction_timeout
Reported-by: Alexander Lakhin
This commit is contained in:
parent
a661bf7b0f
commit
28e858c0f9
|
@ -9167,7 +9167,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
Terminate any session that spans longer than the specified amount of
|
Terminate any session that spans longer than the specified amount of
|
||||||
time in the transaction. The limit applies both to explicit transactions
|
time in a transaction. The limit applies both to explicit transactions
|
||||||
(started with <command>BEGIN</command>) and to an implicitly started
|
(started with <command>BEGIN</command>) and to an implicitly started
|
||||||
transaction corresponding to a single statement.
|
transaction corresponding to a single statement.
|
||||||
If this value is specified without units, it is taken as milliseconds.
|
If this value is specified without units, it is taken as milliseconds.
|
||||||
|
@ -9177,7 +9177,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
|
||||||
<para>
|
<para>
|
||||||
If <varname>transaction_timeout</varname> is shorter or equal to
|
If <varname>transaction_timeout</varname> is shorter or equal to
|
||||||
<varname>idle_in_transaction_session_timeout</varname> or <varname>statement_timeout</varname>
|
<varname>idle_in_transaction_session_timeout</varname> or <varname>statement_timeout</varname>
|
||||||
<varname>transaction_timeout</varname> will invalidate the longer timeout.
|
then the longer timeout is ignored.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
<para>
|
<para>
|
||||||
|
|
|
@ -2589,7 +2589,7 @@ struct config_int ConfigureNamesInt[] =
|
||||||
|
|
||||||
{
|
{
|
||||||
{"transaction_timeout", PGC_USERSET, CLIENT_CONN_STATEMENT,
|
{"transaction_timeout", PGC_USERSET, CLIENT_CONN_STATEMENT,
|
||||||
gettext_noop("Sets the maximum allowed time in a transaction with a session (not a prepared transaction)."),
|
gettext_noop("Sets the maximum allowed duration of any transaction within a session (not a prepared transaction)."),
|
||||||
gettext_noop("A value of 0 turns off the timeout."),
|
gettext_noop("A value of 0 turns off the timeout."),
|
||||||
GUC_UNIT_MS
|
GUC_UNIT_MS
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue