database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Fix inappropriate error messages for Hot Standby misconfiguration errors.

Browse Source 
Give the correct name of the GUC parameter being complained of.
Also, emit a more suitable SQLSTATE (INVALID_PARAMETER_VALUE,
not the default INTERNAL_ERROR).

Gurjeet Singh, errcode adjustment by me
This commit is contained in:
Tom Lane
2012-09-05 21:49:11 -04:00
parent 8a66a37d6d
commit 308d4ec4c6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/access/transam/xlog.c
View File

@ -5990,9 +5990,10 @@ GetXLogReceiptTime(TimestampTz *rtime, bool *fromStream)
*/ */
#define RecoveryRequiresIntParameter(param_name, currValue, minValue) \ #define RecoveryRequiresIntParameter(param_name, currValue, minValue) \
do { \ do { \
if (currValue < minValue) \ if ((currValue) < (minValue)) \
ereport(ERROR, \ ereport(ERROR, \
(errmsg("hot standby is not possible because " \ (errcode(ERRCODE_INVALID_PARAMETER_VALUE), \
errmsg("hot standby is not possible because " \
"%s = %d is a lower setting than on the master server " \ "%s = %d is a lower setting than on the master server " \
"(its value was %d)", \ "(its value was %d)", \
param_name, \ param_name, \
@ -6033,10 +6034,10 @@ CheckRequiredParameterValues(void)
RecoveryRequiresIntParameter("max_connections", RecoveryRequiresIntParameter("max_connections",
MaxConnections, MaxConnections,
ControlFile->MaxConnections); ControlFile->MaxConnections);
RecoveryRequiresIntParameter("max_prepared_xacts", RecoveryRequiresIntParameter("max_prepared_transactions",
max_prepared_xacts, max_prepared_xacts,
ControlFile->max_prepared_xacts); ControlFile->max_prepared_xacts);
RecoveryRequiresIntParameter("max_locks_per_xact", RecoveryRequiresIntParameter("max_locks_per_transaction",
max_locks_per_xact, max_locks_per_xact,
ControlFile->max_locks_per_xact); ControlFile->max_locks_per_xact);
} }