On Sat, 2024-03-09 at 14:03 +0100, Laurenz Albe wrote: > Here is a patch that implements this.
And here is patch v2 that fixes a bug and passes the regression tests. Yours, Laurenz Albe
From 6c72ea7d0aa1df569a4e53f54fcb1a11542ac0ef Mon Sep 17 00:00:00 2001 From: Laurenz Albe <laurenz.a...@cybertec.at> Date: Mon, 11 Mar 2024 03:41:49 +0100 Subject: [PATCH v2] Add parameter log_suppress_errcodes The parameter contains a list of SQLSTATEs for which FATAL and ERROR messages are not logged. This is to suppress messages that are of little interest to the database administrator, but tend to clutter the log. Author: Laurenz Albe Discussion: https://postgr.es/m/408f399e7de1416c47bab7e260327ed5ad92838c.camel%40cybertec.at --- doc/src/sgml/config.sgml | 34 +++++ doc/src/sgml/logical-replication.sgml | 3 +- src/backend/utils/error/elog.c | 116 ++++++++++++++++++ src/backend/utils/misc/guc_tables.c | 11 ++ src/backend/utils/misc/postgresql.conf.sample | 4 + src/bin/pg_ctl/t/004_logrotate.pl | 1 + src/include/pg_config_manual.h | 10 ++ src/include/utils/guc.h | 1 + src/include/utils/guc_hooks.h | 2 + src/test/subscription/t/014_binary.pl | 5 + src/test/subscription/t/029_on_error.pl | 1 + 11 files changed, 187 insertions(+), 1 deletion(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 43b1a132a2..89a698c7b6 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -6850,6 +6850,40 @@ local0.* /var/log/postgresql </listitem> </varlistentry> + <varlistentry id="guc-log-suppress-errcodes" xreflabel="log_suppress_errcodes"> + <term><varname>log_suppress_errcodes</varname> (<type>string</type>) + <indexterm> + <primary><varname>log_suppress_errcodes</varname> configuration parameter</primary> + </indexterm> + </term> + <listitem> + <para> + Causes <literal>ERROR</literal> and <literal>FATAL</literal> messages + with certain error codes to be excluded from the log. + The value is a comma-separated list of five-character error codes as + listed in <xref linkend="errcodes-appendix"/>. An error code that + represents a class of errors (ends with three zeros) suppresses logging + of all error codes within that class. For example, the entry + <literal>08000</literal> (<literal>connection_exception</literal>) + would suppress an error with code <literal>08P01</literal> + (<literal>protocol_violation</literal>). The default setting is + <literal>23505,3D000,3F000,42601,42704,42883,42P01,57P03</literal>. + Only superusers and users with the appropriate <literal>SET</literal> + privilege can change this setting. + </para> + + <para> + This setting is useful to exclude error messages from the log that are + frequent but irrelevant. That makes it easier to spot relevant + messages in the log and keeps log files from growing too big. For + example, if you have a monitoring system that regularly establishes a + TCP connection to the server without sending a correct startup packet, + you could suppress the protocol violation errors by adding the error + code <literal>08P01</literal> to the list. + </para> + </listitem> + </varlistentry> + <varlistentry id="guc-log-min-duration-statement" xreflabel="log_min_duration_statement"> <term><varname>log_min_duration_statement</varname> (<type>integer</type>) <indexterm> diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml index ec2130669e..6c647a8782 100644 --- a/doc/src/sgml/logical-replication.sgml +++ b/doc/src/sgml/logical-replication.sgml @@ -1490,7 +1490,8 @@ test_sub=# SELECT * FROM t1 ORDER BY id; <para> A conflict will produce an error and will stop the replication; it must be resolved manually by the user. Details about the conflict can be found in - the subscriber's server log. + the subscriber's server log if you remove <literal>23505</literal> from + <xref linkend="guc-log-suppress-errcodes"/>. </para> <para> diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index c9719f358b..01eb00e870 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -112,12 +112,16 @@ int Log_error_verbosity = PGERROR_DEFAULT; char *Log_line_prefix = NULL; /* format for extra log line info */ int Log_destination = LOG_DESTINATION_STDERR; char *Log_destination_string = NULL; +char *log_suppress_errcodes = NULL; bool syslog_sequence_numbers = true; bool syslog_split_messages = true; /* Processed form of backtrace_functions GUC */ static char *backtrace_function_list; +/* Processed form form of log_suppress_errcodes (zero-terminated array) */ +static int *suppressed_errcodes; + #ifdef HAVE_SYSLOG /* @@ -866,6 +870,27 @@ errcode(int sqlerrcode) edata->sqlerrcode = sqlerrcode; + /* + * ERROR and FATAL messages with codes in log_suppress_errcodes don't get + * logged. + */ + if ((edata->elevel == ERROR || + edata->elevel == FATAL) && + suppressed_errcodes != NULL) + { + int *state; + + for (state = suppressed_errcodes; *state != 0; state++) + /* error categories match all error codes in the category */ + if (sqlerrcode == *state || + (ERRCODE_IS_CATEGORY(*state) && + ERRCODE_TO_CATEGORY(sqlerrcode) == *state)) + { + edata->output_to_server = false; + break; + } + } + return 0; /* return value does not matter */ } @@ -2258,6 +2283,97 @@ assign_log_destination(const char *newval, void *extra) Log_destination = *((int *) extra); } +/* + * GUC check_hook for log_suppress_errcodes + */ +bool +check_log_suppress_errcodes(char **newval, void **extra, GucSource source) +{ + /* SplitIdentifierString modifies the string */ + char *new_copy = pstrdup(*newval); + int listlen; + int *statelist = NULL; + int index = 0; + List *states; + ListCell *c; + + if (!SplitIdentifierString(new_copy, ',', &states)) + { + GUC_check_errdetail("List syntax is invalid."); + goto failed; + } + + listlen = list_length(states); + statelist = guc_malloc(ERROR, sizeof(int) * (listlen + 1)); + + /* check all error codes for validity and compile them into statelist */ + foreach(c, states) + { + char *state = lfirst(c); + char *p; + int errcode; + + if (strlen(state) != 5) + { + GUC_check_errdetail("error codes must have 5 characters."); + goto failed; + } + + /* + * Check the the values are alphanumeric and convert them to upper case + * (SplitIdentifierString converted them to lower case). + */ + for (p = state; *p != '\0'; p++) + if (*p >= 'a' && *p <= 'z') + *p += 'A' - 'a'; + else if (*p < '0' || *p > '9') + { + GUC_check_errdetail("error codes can only contain digits and ASCII letters."); + goto failed; + } + + errcode = MAKE_SQLSTATE(state[0], state[1], state[2], state[3], state[4]); + /* ignore 0: it cannot be an error code, and we use it to end the list */ + if (errcode == ERRCODE_SUCCESSFUL_COMPLETION) + continue; + + statelist[index++] = errcode; + } + statelist[index] = 0; + + list_free(states); + pfree(new_copy); + + *extra = statelist; + return true; + +failed: + list_free(states); + pfree(new_copy); + guc_free(statelist); + return false; +} + +/* + * GUC assign_hook for log_suppress_errcodes + */ +void +assign_log_suppress_errcodes(const char *newval, void *extra) +{ + /* free the memory for the old entries */ + if (suppressed_errcodes != NULL) + pfree(suppressed_errcodes); + + /* store NULL instead of an empty array for performance */ + if (*(int *)extra == 0) + { + guc_free(extra); + suppressed_errcodes = NULL; + } + else + suppressed_errcodes = extra; +} + /* * GUC assign_hook for syslog_ident */ diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index 93ded31ed9..9dbb30fd33 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -4466,6 +4466,17 @@ struct config_string ConfigureNamesString[] = check_canonical_path, NULL, NULL }, + { + {"log_suppress_errcodes", PGC_SUSET, LOGGING_WHEN, + gettext_noop("ERROR and FATAL messages with these error codes don't get logged."), + NULL, + GUC_LIST_INPUT + }, + &log_suppress_errcodes, + DEFAULT_LOG_SUPPRESS_ERRCODES, + check_log_suppress_errcodes, assign_log_suppress_errcodes, NULL + }, + { {"ssl_library", PGC_INTERNAL, PRESET_OPTIONS, gettext_noop("Shows the name of the SSL library."), diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index edcc0282b2..838c24eff9 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -536,6 +536,10 @@ # fatal # panic (effectively off) +#log_suppress_errcodes = '23505,3D000,3F000,42601,42704,42883,42P01,57P03' + # FATAL and ERROR messages with these error codes + # are not logged + #log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements # and their durations, > 0 logs only # statements running at least this number diff --git a/src/bin/pg_ctl/t/004_logrotate.pl b/src/bin/pg_ctl/t/004_logrotate.pl index eacca1a652..59237476e3 100644 --- a/src/bin/pg_ctl/t/004_logrotate.pl +++ b/src/bin/pg_ctl/t/004_logrotate.pl @@ -66,6 +66,7 @@ $node->append_conf( 'postgresql.conf', qq( logging_collector = on log_destination = 'stderr, csvlog, jsonlog' +log_suppress_errcodes = '00000,P0000' # these ensure stability of test results: log_rotation_age = 0 lc_messages = 'C' diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h index a512552182..91c7b02b30 100644 --- a/src/include/pg_config_manual.h +++ b/src/include/pg_config_manual.h @@ -216,6 +216,16 @@ */ #define DEFAULT_EVENT_SOURCE "PostgreSQL" +/* + * Default value for log_suppress_errcodes. ERROR or FATAL messages with + * these error codes are never logged. Error classes (error codes ending with + * three zeros) match all error codes in the class. The idea is to suppress + * messages that usually don't indicate a serious problem but tend to pollute + * the log file. + */ + +#define DEFAULT_LOG_SUPPRESS_ERRCODES "23505,3D000,3F000,42601,42704,42883,42P01,57P03" + /* * Assumed cache line size. This doesn't affect correctness, but can be used * for low-level optimizations. This is mostly used to pad various data diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 471d53da8f..a3499f1d14 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -258,6 +258,7 @@ extern PGDLLIMPORT bool log_duration; extern PGDLLIMPORT int log_parameter_max_length; extern PGDLLIMPORT int log_parameter_max_length_on_error; extern PGDLLIMPORT int log_min_error_statement; +extern PGDLLIMPORT char *log_suppress_errcodes; extern PGDLLIMPORT int log_min_messages; extern PGDLLIMPORT int client_min_messages; extern PGDLLIMPORT int log_min_duration_sample; diff --git a/src/include/utils/guc_hooks.h b/src/include/utils/guc_hooks.h index c8a7aa9a11..a77ff24220 100644 --- a/src/include/utils/guc_hooks.h +++ b/src/include/utils/guc_hooks.h @@ -78,6 +78,8 @@ extern bool check_log_destination(char **newval, void **extra, extern void assign_log_destination(const char *newval, void *extra); extern const char *show_log_file_mode(void); extern bool check_log_stats(bool *newval, void **extra, GucSource source); +extern bool check_log_suppress_errcodes(char **newval, void **extra, GucSource source); +extern void assign_log_suppress_errcodes(const char *newval, void *extra); extern bool check_log_timezone(char **newval, void **extra, GucSource source); extern void assign_log_timezone(const char *newval, void *extra); extern const char *show_log_timezone(void); diff --git a/src/test/subscription/t/014_binary.pl b/src/test/subscription/t/014_binary.pl index a7598f12fb..b4639c347a 100644 --- a/src/test/subscription/t/014_binary.pl +++ b/src/test/subscription/t/014_binary.pl @@ -17,6 +17,11 @@ $node_publisher->start; # Create and initialize subscriber node my $node_subscriber = PostgreSQL::Test::Cluster->new('subscriber'); $node_subscriber->init; +$node_subscriber->append_conf( + 'postgresql.conf', + qq[ +log_suppress_errcodes = '' +]); $node_subscriber->start; # Create tables on both sides of the replication diff --git a/src/test/subscription/t/029_on_error.pl b/src/test/subscription/t/029_on_error.pl index 7a8e424a22..0bf695f28d 100644 --- a/src/test/subscription/t/029_on_error.pl +++ b/src/test/subscription/t/029_on_error.pl @@ -82,6 +82,7 @@ $node_subscriber->append_conf( 'postgresql.conf', qq[ max_prepared_transactions = 10 +log_suppress_errcodes = '' ]); $node_subscriber->start; -- 2.44.0
