From 63932a6d38e5dfa6df2a51a04b7314ec1e4d3de7 Mon Sep 17 00:00:00 2001 From: Thomas Munro Date: Mon, 15 May 2023 10:45:19 +1200 Subject: Fix wal_writer_flush_after initializer value. Commit a73952b7956 (new in 16) required default values in guc_table.c and C variable initializers to match. This one only matched when XLOG_BLCKSZ == 8kB. Fix by using the same expression in both places with a new DEFAULT_XXX macro, as done for other GUCs. Reviewed-by: Andres Freund Discussion: https://postgr.es/m/CA+hUKGLNmLV=VrT==5MqnbARgx2ifRSFtdd8ofdfrdSLL3yv5A@mail.gmail.com --- src/backend/postmaster/walwriter.c | 2 +- src/backend/utils/misc/guc_tables.c | 2 +- src/include/postmaster/walwriter.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/postmaster/walwriter.c b/src/backend/postmaster/walwriter.c index 65e84be39b..266fbc2339 100644 --- a/src/backend/postmaster/walwriter.c +++ b/src/backend/postmaster/walwriter.c @@ -68,7 +68,7 @@ * GUC parameters */ int WalWriterDelay = 200; -int WalWriterFlushAfter = 128; +int WalWriterFlushAfter = DEFAULT_WAL_WRITER_FLUSH_AFTER; /* * Number of do-nothing loops before lengthening the delay time, and the diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index efd59a47cf..8abf9bb644 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -2780,7 +2780,7 @@ struct config_int ConfigureNamesInt[] = GUC_UNIT_XBLOCKS }, &WalWriterFlushAfter, - (1024 * 1024) / XLOG_BLCKSZ, 0, INT_MAX, + DEFAULT_WAL_WRITER_FLUSH_AFTER, 0, INT_MAX, NULL, NULL, NULL }, diff --git a/src/include/postmaster/walwriter.h b/src/include/postmaster/walwriter.h index 22281a97ba..6eba7ad79c 100644 --- a/src/include/postmaster/walwriter.h +++ b/src/include/postmaster/walwriter.h @@ -12,6 +12,8 @@ #ifndef _WALWRITER_H #define _WALWRITER_H +#define DEFAULT_WAL_WRITER_FLUSH_AFTER ((1024 * 1024) / XLOG_BLCKSZ) + /* GUC options */ extern PGDLLIMPORT int WalWriterDelay; extern PGDLLIMPORT int WalWriterFlushAfter; -- cgit v1.2.1