On Mon, 2010-04-05 at 15:02 -0400, Alvaro Herrera wrote:
> Simon Riggs escribió:
> > On Mon, 2010-04-05 at 17:08 +0900, Fujii Masao wrote:
> > > On Sat, Apr 3, 2010 at 6:50 AM, Simon Riggs <sri...@postgresql.org> wrote:
> > > > Log Message:
> > > > -----------
> > > > Check compulsory parameters in recovery.conf in standby_mode, per docs.
> > >
> > > On the recent discussion (*1), some people argued that specifying neither
> > > primary_conninfo nor restore_command in the standby mode is not
> > > unreasonable,
> > > and we reached the consensus that the setting should be allowed. So this
> > > commit doesn't reflect the discussion. How about reverting the commit,
> > > and restarting the discussion if you have complaint against the consensus?
> >
> > The attached patch changes the messages and downgrades FATAL to WARNING.
> >
> > Comments?
>
> Please note that errdetail must be a complete sentence.
Better?
--
Simon Riggs www.2ndQuadrant.com
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index abdf4d8..8a12b02 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -5092,15 +5092,16 @@ readRecoveryCommandFile(void)
if (StandbyMode)
{
if (PrimaryConnInfo == NULL && recoveryRestoreCommand == NULL)
- ereport(FATAL,
+ ereport(WARNING,
(errmsg("recovery command file \"%s\" specified neither primary_conninfo nor restore_command",
- RECOVERY_COMMAND_FILE)));
+ RECOVERY_COMMAND_FILE),
+ errdetail("The database server will regularly poll the pg_xlog subdirectory to check for files placed there.")));
}
else
{
if (recoveryRestoreCommand == NULL)
ereport(FATAL,
- (errmsg("recovery command file \"%s\" did not specify restore_command nor standby_mode",
+ (errmsg("recovery command file \"%s\" must specify restore_command when standby mode is not enabled",
RECOVERY_COMMAND_FILE)));
}
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
