diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 41 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 |
3 files changed, 42 insertions, 3 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 5b6a2302b19..85b2dcae070 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -69,7 +69,7 @@ /* User-settable parameters */ int CheckPointSegments = 3; int wal_keep_segments = 0; -int XLOGbuffers = 8; +int XLOGbuffers = -1; int XLogArchiveTimeout = 0; bool XLogArchiveMode = false; char *XLogArchiveCommand = NULL; @@ -4778,6 +4778,41 @@ GetSystemIdentifier(void) } /* + * Auto-tune the number of XLOG buffers. + * + * If the user-set value of wal_buffers is -1, we auto-tune to about 3% of + * shared_buffers, with a maximum of one XLOG segment and a minimum of 8 + * blocks (8 was the default value prior to PostgreSQL 9.1, when auto-tuning + * was added). We also clamp manually-set values to at least 4 blocks; prior + * to PostgreSQL 9.1, a minimum of 4 was enforced by guc.c, but since that + * is no longer possible, we just silently treat such values as a request for + * the minimum. + */ +static void +XLOGTuneNumBuffers(void) +{ + int xbuffers = XLOGbuffers; + char buf[32]; + + if (xbuffers == -1) + { + xbuffers = NBuffers / 32; + if (xbuffers > XLOG_SEG_SIZE / XLOG_BLCKSZ) + xbuffers = XLOG_SEG_SIZE / XLOG_BLCKSZ; + if (xbuffers < 8) + xbuffers = 8; + } + else if (xbuffers < 4) + xbuffers = 4; + + if (xbuffers != XLOGbuffers) + { + snprintf(buf, sizeof(buf), "%d", xbuffers); + SetConfigOption("wal_buffers", buf, PGC_POSTMASTER, PGC_S_OVERRIDE); + } +} + +/* * Initialization of shared memory for XLOG */ Size @@ -4785,6 +4820,10 @@ XLOGShmemSize(void) { Size size; + /* Figure out how many XLOG buffers we need. */ + XLOGTuneNumBuffers(); + Assert(XLOGbuffers > 0); + /* XLogCtl */ size = sizeof(XLogCtlData); /* xlblocks array */ diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index ffff6015596..73b9f1b01ca 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1765,7 +1765,7 @@ static struct config_int ConfigureNamesInt[] = GUC_UNIT_XBLOCKS }, &XLOGbuffers, - 8, 4, INT_MAX, NULL, NULL + -1, -1, INT_MAX, NULL, NULL }, { diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index f436b834680..6c6f9a9a0d8 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -162,7 +162,7 @@ # fsync_writethrough # open_sync #full_page_writes = on # recover from partial page writes -#wal_buffers = 64kB # min 32kB +#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers # (change requires restart) #wal_writer_delay = 200ms # 1-10000 milliseconds |