Skip to content

Commit 481cb5d

Browse files
robertmhaasrobertmhaas
committed
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.
1 parent c670410 commit 481cb5d

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

‎doc/src/sgml/config.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.268 2010/04/19 00:55:25 rhaas Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.269 2010/04/20 11:15:06 rhaas Exp $ -->
22

33
<chapter Id="runtime-config">
44
<title>Server Configuration</title>
@@ -1842,28 +1842,28 @@ SET ENABLE_SEQSCAN TO OFF;
18421842
</listitem>
18431843
</varlistentry>
18441844

1845-
<varlistentry id="guc-standby-keep-segments" xreflabel="standby_keep_segments">
1846-
<term><varname>standby_keep_segments</varname> (<type>integer</type>)</term>
1845+
<varlistentry id="guc-wal-keep-segments" xreflabel="wal_keep_segments">
1846+
<term><varname>wal_keep_segments</varname> (<type>integer</type>)</term>
18471847
<indexterm>
1848-
<primary><varname>standby_keep_segments</> configuration parameter</primary>
1848+
<primary><varname>wal_keep_segments</> configuration parameter</primary>
18491849
</indexterm>
18501850
<listitem>
18511851
<para>
18521852
Specifies the number of log file segments kept in <filename>pg_xlog</>
18531853
directory, in case a standby server needs to fetch them via streaming
18541854
replication. Each segment is normally 16 megabytes. If a standby
18551855
server connected to the primary falls behind more than
1856-
<varname>standby_keep_segments</> segments, the primary might remove
1856+
<varname>wal_keep_segments</> segments, the primary might remove
18571857
a WAL segment still needed by the standby and the replication
18581858
connection will be terminated.
18591859

18601860
This sets only the minimum number of segments retained for standby
1861-
purposes, the system might need to retain more segments for WAL
1862-
archival or to recover from a checkpoint. If <varname>standby_keep_segments</>
1861+
purposes; the system might need to retain more segments for WAL
1862+
archival or to recover from a checkpoint. If <varname>wal_keep_segments</>
18631863
is zero (the default), the system doesn't keep any extra segments
18641864
for standby purposes, and the number of old WAL segments available
18651865
for standbys is determined based only on the location of the previous
1866-
checkpoint and status of WAL archival.
1866+
checkpoint and status of WAL archiving.
18671867
This parameter can only be set in the <filename>postgresql.conf</>
18681868
file or on the server command line.
18691869
</para>

‎doc/src/sgml/high-availability.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.60 2010/04/12 10:01:04 heikki Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/high-availability.sgml,v 1.61 2010/04/20 11:15:06 rhaas Exp $ -->
22

33
<chapter id="high-availability">
44
<title>High Availability, Load Balancing, and Replication</title>
@@ -737,7 +737,7 @@ trigger_file = '/path/to/trigger_file'
737737
falls behind too much, the primary will delete old WAL files still
738738
needed by the standby, and the standby will have to be manually restored
739739
from a base backup. You can control how long the primary retains old WAL
740-
segments using the <varname>standby_keep_segments</> setting.
740+
segments using the <varname>wal_keep_segments</> setting.
741741
</para>
742742

743743
<para>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.400 2010/04/18 18:44:53 sriggs Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.401 2010/04/20 11:15:06 rhaas Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -66,7 +66,7 @@
6666

6767
/* User-settable parameters */
6868
int CheckPointSegments = 3;
69-
int StandbySegments = 0;
69+
int wal_keep_segments = 0;
7070
int XLOGbuffers = 8;
7171
int XLogArchiveTimeout = 0;
7272
bool XLogArchiveMode = false;
@@ -7285,10 +7285,10 @@ CreateCheckPoint(int flags)
72857285
{
72867286
/*
72877287
* Calculate the last segment that we need to retain because of
7288-
* standby_keep_segments, by subtracting StandbySegments from the
7288+
* wal_keep_segments, by subtracting wal_keep_segments from the
72897289
* new checkpoint location.
72907290
*/
7291-
if (StandbySegments > 0)
7291+
if (wal_keep_segments > 0)
72927292
{
72937293
uint32 log;
72947294
uint32 seg;
@@ -7297,8 +7297,8 @@ CreateCheckPoint(int flags)
72977297

72987298
XLByteToSeg(recptr, log, seg);
72997299

7300-
d_seg = StandbySegments % XLogSegsPerFile;
7301-
d_log = StandbySegments / XLogSegsPerFile;
7300+
d_seg = wal_keep_segments % XLogSegsPerFile;
7301+
d_log = wal_keep_segments / XLogSegsPerFile;
73027302
if (seg < d_seg)
73037303
{
73047304
d_log += 1;

‎src/backend/utils/misc/guc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.548 2010/04/19 00:55:25 rhaas Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.549 2010/04/20 11:15:06 rhaas Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -1656,11 +1656,11 @@ static struct config_int ConfigureNamesInt[] =
16561656
},
16571657

16581658
{
1659-
{"standby_keep_segments", PGC_SIGHUP, WAL_CHECKPOINTS,
1659+
{"wal_keep_segments", PGC_SIGHUP, WAL_CHECKPOINTS,
16601660
gettext_noop("Sets the number of WAL files held for standby servers"),
16611661
NULL
16621662
},
1663-
&StandbySegments,
1663+
&wal_keep_segments,
16641664
0, 0, INT_MAX, NULL, NULL
16651665
},
16661666

‎src/backend/utils/misc/postgresql.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193

194194
#max_wal_senders = 0 # max number of walsender processes
195195
#wal_sender_delay = 200ms # 1-10000 milliseconds
196-
#standby_keep_segments = 0 # in logfile segments, 16MB each; 0 disables
196+
#wal_keep_segments = 0 # in logfile segments, 16MB each; 0 disables
197197

198198

199199
#------------------------------------------------------------------------------

‎src/include/access/xlog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.108 2010/04/18 18:17:12 sriggs Exp $
9+
* $PostgreSQL: pgsql/src/include/access/xlog.h,v 1.109 2010/04/20 11:15:06 rhaas Exp $
1010
*/
1111
#ifndef XLOG_H
1212
#define XLOG_H
@@ -187,7 +187,7 @@ extern XLogRecPtr XactLastRecEnd;
187187

188188
/* these variables are GUC parameters related to XLOG */
189189
extern int CheckPointSegments;
190-
extern int StandbySegments;
190+
extern int wal_keep_segments;
191191
extern int XLOGbuffers;
192192
extern bool XLogArchiveMode;
193193
extern char *XLogArchiveCommand;

0 commit comments

Comments
 (0)