diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2010-04-23 20:21:31 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2010-04-23 20:21:31 +0000 |
| commit | 491d1ea5b3605809ec1103e939b3324acc9a2516 (patch) | |
| tree | 38842e52819ba421fa9a096e76ff9f2e22d3ddf5 /src/backend/access/transam/xlog.c | |
| parent | 6ca23b1a29497d496266e2ad47954d4fbc98065d (diff) | |
| download | postgresql-491d1ea5b3605809ec1103e939b3324acc9a2516.tar.gz postgresql-491d1ea5b3605809ec1103e939b3324acc9a2516.zip | |
Previous patch revoked following objections.
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index ba839f941fc..3f339825ae7 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.402 2010/04/23 19:57:18 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.403 2010/04/23 20:21:31 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -5568,12 +5568,7 @@ CheckRequiredParameterValues(CheckPoint checkPoint) RecoveryRequiresIntParameter("max_locks_per_xact", max_locks_per_xact, checkPoint.max_locks_per_xact); - /* - * Hot Standby currently only depends upon the presence of WAL - * records as indicated by XLOG_MODE_HOT_STANDBY. There is no current - * dependency on whether archiving or streaming are enabled, if either. - */ - if (!(checkPoint.XLogModeFlags & XLOG_MODE_HOT_STANDBY)) + if (!checkPoint.XLogStandbyInfoMode) ereport(ERROR, (errmsg("recovery connections cannot start because the recovery_connections " "parameter is disabled on the WAL source server"))); @@ -7007,13 +7002,7 @@ CreateCheckPoint(int flags) checkPoint.MaxConnections = MaxConnections; checkPoint.max_prepared_xacts = max_prepared_xacts; checkPoint.max_locks_per_xact = max_locks_per_xact; - - if (XLogArchivingActive()) - checkPoint.XLogModeFlags |= XLOG_MODE_ARCHIVING; - if (max_wal_senders > 0) - checkPoint.XLogModeFlags |= XLOG_MODE_STREAMING; - if (XLogRequestRecoveryConnections) - checkPoint.XLogModeFlags |= XLOG_MODE_HOT_STANDBY; + checkPoint.XLogStandbyInfoMode = XLogStandbyInfoActive(); /* * We must hold WALInsertLock while examining insert state to determine |