From 481cb5d9b506069a6fbe2a7069b576e8eb2f2cde Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Tue, 20 Apr 2010 11:15:06 +0000 Subject: [PATCH] Rename standby_keep_segments to wal_keep_segments. Also, make the name of the GUC and the name of the backing variable match. Alnong the way, clean up a couple of slight typographical errors in the related docs. --- doc/src/sgml/config.sgml | 16 ++++++++-------- doc/src/sgml/high-availability.sgml | 4 ++-- src/backend/access/transam/xlog.c | 12 ++++++------ src/backend/utils/misc/guc.c | 6 +++--- src/backend/utils/misc/postgresql.conf.sample | 2 +- src/include/access/xlog.h | 4 ++-- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index eb3e8edd43..e1372bf4a8 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -1,4 +1,4 @@ - + Server Configuration @@ -1842,10 +1842,10 @@ SET ENABLE_SEQSCAN TO OFF; - - standby_keep_segments (integer) + + wal_keep_segments (integer) - standby_keep_segments configuration parameter + wal_keep_segments configuration parameter @@ -1853,17 +1853,17 @@ SET ENABLE_SEQSCAN TO OFF; directory, in case a standby server needs to fetch them via streaming replication. Each segment is normally 16 megabytes. If a standby server connected to the primary falls behind more than - standby_keep_segments segments, the primary might remove + wal_keep_segments segments, the primary might remove a WAL segment still needed by the standby and the replication connection will be terminated. This sets only the minimum number of segments retained for standby - purposes, the system might need to retain more segments for WAL - archival or to recover from a checkpoint. If standby_keep_segments + purposes; the system might need to retain more segments for WAL + archival or to recover from a checkpoint. If wal_keep_segments is zero (the default), the system doesn't keep any extra segments for standby purposes, and the number of old WAL segments available for standbys is determined based only on the location of the previous - checkpoint and status of WAL archival. + checkpoint and status of WAL archiving. This parameter can only be set in the postgresql.conf file or on the server command line. diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index c27c190305..d2a8ea7799 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -1,4 +1,4 @@ - + High Availability, Load Balancing, and Replication @@ -737,7 +737,7 @@ trigger_file = '/path/to/trigger_file' falls behind too much, the primary will delete old WAL files still needed by the standby, and the standby will have to be manually restored from a base backup. You can control how long the primary retains old WAL - segments using the standby_keep_segments setting. + segments using the wal_keep_segments setting. diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 9a60cb9cba..f887dc2878 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.400 2010/04/18 18:44:53 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.401 2010/04/20 11:15:06 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -66,7 +66,7 @@ /* User-settable parameters */ int CheckPointSegments = 3; -int StandbySegments = 0; +int wal_keep_segments = 0; int XLOGbuffers = 8; int XLogArchiveTimeout = 0; bool XLogArchiveMode = false; @@ -7285,10 +7285,10 @@ CreateCheckPoint(int flags) { /* * Calculate the last segment that we need to retain because of - * standby_keep_segments, by subtracting StandbySegments from the + * wal_keep_segments, by subtracting wal_keep_segments from the * new checkpoint location. */ - if (StandbySegments > 0) + if (wal_keep_segments > 0) { uint32 log; uint32 seg; @@ -7297,8 +7297,8 @@ CreateCheckPoint(int flags) XLByteToSeg(recptr, log, seg); - d_seg = StandbySegments % XLogSegsPerFile; - d_log = StandbySegments / XLogSegsPerFile; + d_seg = wal_keep_segments % XLogSegsPerFile; + d_log = wal_keep_segments / XLogSegsPerFile; if (seg < d_seg) { d_log += 1; diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 04ee99ac30..15ca9c1b22 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut . * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.548 2010/04/19 00:55:25 rhaas Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.549 2010/04/20 11:15:06 rhaas Exp $ * *-------------------------------------------------------------------- */ @@ -1656,11 +1656,11 @@ static struct config_int ConfigureNamesInt[] = }, { - {"standby_keep_segments", PGC_SIGHUP, WAL_CHECKPOINTS, + {"wal_keep_segments", PGC_SIGHUP, WAL_CHECKPOINTS, gettext_noop("Sets the number of WAL files held for standby servers"), NULL }, - &StandbySegments, + &wal_keep_segments, 0, 0, INT_MAX, NULL, NULL }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index c3f985a2d3..92763eb523 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -193,7 +193,7 @@ #max_wal_senders = 0 # max number of walsender processes #wal_sender_delay = 200ms # 1-10000 milliseconds -#standby_keep_segments = 0 # in logfile segments, 16MB each; 0 disables +#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables #------------------------------------------------------------------------------ diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index c29c98271a..4812997659 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.108 2010/04/18 18:17:12 sriggs Exp $ + * $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.109 2010/04/20 11:15:06 rhaas Exp $ */ #ifndef XLOG_H #define XLOG_H @@ -187,7 +187,7 @@ extern XLogRecPtr XactLastRecEnd; /* these variables are GUC parameters related to XLOG */ extern int CheckPointSegments; -extern int StandbySegments; +extern int wal_keep_segments; extern int XLOGbuffers; extern bool XLogArchiveMode; extern char *XLogArchiveCommand; -- 2.11.0