NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit2e0cc1f

committed

Fix inappropriate error messages for Hot Standby misconfiguration errors.

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

1 parent185b744 commit2e0cc1fCopy full SHA for 2e0cc1f

File tree

1 file changed

-4

lines changed

src/backend/access/transam
- xlog.c

1 file changed

-4

lines changed

`‎src/backend/access/transam/xlog.c`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5989,9 +5989,10 @@ GetXLogReceiptTime(TimestampTz rtime, bool fromStream)`
`5989`	`5989`	`*/`
`5990`	`5990`	`#defineRecoveryRequiresIntParameter(param_name,currValue,minValue) \`
`5991`	`5991`	`do { \`
`5992`		`-if (currValue < minValue) \`
	`5992`	`+if ((currValue) <(minValue)) \`
`5993`	`5993`	`ereport(ERROR, \`
`5994`		`-(errmsg("hot standby is not possible because " \`
	`5994`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE), \`
	`5995`	`+ errmsg("hot standby is not possible because " \`
`5995`	`5996`	`"%s = %d is a lower setting than on the master server " \`
`5996`	`5997`	`"(its value was %d)", \`
`5997`	`5998`	`param_name, \`
`@@ -6032,10 +6033,10 @@ CheckRequiredParameterValues(void)`
`6032`	`6033`	`RecoveryRequiresIntParameter("max_connections",`
`6033`	`6034`	`MaxConnections,`
`6034`	`6035`	`ControlFile->MaxConnections);`
`6035`		`-RecoveryRequiresIntParameter("max_prepared_xacts",`
	`6036`	`+RecoveryRequiresIntParameter("max_prepared_transactions",`
`6036`	`6037`	`max_prepared_xacts,`
`6037`	`6038`	`ControlFile->max_prepared_xacts);`
`6038`		`-RecoveryRequiresIntParameter("max_locks_per_xact",`
	`6039`	`+RecoveryRequiresIntParameter("max_locks_per_transaction",`
`6039`	`6040`	`max_locks_per_xact,`
`6040`	`6041`	`ControlFile->max_locks_per_xact);`
`6041`	`6042`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit2e0cc1f

File tree

1 file changed

1 file changed

`‎src/backend/access/transam/xlog.c`

0 commit comments