public inbox for [email protected]help / color / mirror / Atom feed
[PATCH v7 1/2] Move pg_upgrade kludges to sql script 13+ messages / 9 participants [nested] [flat]
* [PATCH v7 1/2] Move pg_upgrade kludges to sql script @ 2021-03-07 00:35 Justin Pryzby <[email protected]> 0 siblings, 0 replies; 13+ messages in thread From: Justin Pryzby @ 2021-03-07 00:35 UTC (permalink / raw) NOTE, "IF EXISTS" isn't necessary in fa66b6dee --- src/bin/pg_upgrade/test-upgrade.sql | 52 +++++++++++++++++++++++++++++ src/bin/pg_upgrade/test.sh | 48 +------------------------- 2 files changed, 53 insertions(+), 47 deletions(-) create mode 100644 src/bin/pg_upgrade/test-upgrade.sql diff --git a/src/bin/pg_upgrade/test-upgrade.sql b/src/bin/pg_upgrade/test-upgrade.sql new file mode 100644 index 0000000000..5d74232c2b --- /dev/null +++ b/src/bin/pg_upgrade/test-upgrade.sql @@ -0,0 +1,52 @@ +-- This file has a bunch of kludges needed for testing upgrades across major versions +-- It supports testing the most recent version of an old release (not any arbitrary minor version). + +SELECT + ver <= 804 AS oldpgversion_le84, + ver < 1000 AS oldpgversion_lt10, + ver < 1200 AS oldpgversion_lt12, + ver < 1400 AS oldpgversion_lt14 + FROM (SELECT current_setting('server_version_num')::int/100 AS ver) AS v; +\gset + +\if :oldpgversion_le84 +DROP FUNCTION public.myfunc(integer); +\endif + +\if :oldpgversion_lt10 +-- last in 9.6 -- commit 5ded4bd21 +DROP FUNCTION public.oldstyle_length(integer, text); +\endif + +\if :oldpgversion_lt14 +-- last in v13 commit 7ca37fb04 +DROP FUNCTION IF EXISTS public.putenv(text); + +-- last in v13 commit 76f412ab3 +-- public.!=- This one is only needed for v11+ ?? +-- Note, until v10, operators could only be dropped one at a time +DROP OPERATOR public.#@# (pg_catalog.int8, NONE); +DROP OPERATOR public.#%# (pg_catalog.int8, NONE); +DROP OPERATOR public.!=- (pg_catalog.int8, NONE); +DROP OPERATOR public.#@%# (pg_catalog.int8, NONE); +\endif + +\if :oldpgversion_lt12 +-- WITH OIDS is not supported anymore in v12, so remove support +-- for any relations marked as such. +DO $stmt$ + DECLARE + rec text; + BEGIN + FOR rec in + SELECT oid::regclass::text + FROM pg_class + WHERE relname !~ '^pg_' + AND relhasoids + AND relkind in ('r','m') + ORDER BY 1 + LOOP + execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS'; + END LOOP; + END; $stmt$; +\endif diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index 8593488907..46a1ebb4ab 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -181,53 +181,7 @@ if "$MAKE" -C "$oldsrc" installcheck-parallel; then # Before dumping, tweak the database of the old instance depending # on its version. if [ "$newsrc" != "$oldsrc" ]; then - fix_sql="" - # Get rid of objects not feasible in later versions - case $oldpgversion in - 804??) - fix_sql="DROP FUNCTION public.myfunc(integer);" - ;; - esac - - # Last appeared in v9.6 - if [ $oldpgversion -lt 100000 ]; then - fix_sql="$fix_sql - DROP FUNCTION IF EXISTS - public.oldstyle_length(integer, text);" - fi - # Last appeared in v13 - if [ $oldpgversion -lt 140000 ]; then - fix_sql="$fix_sql - DROP FUNCTION IF EXISTS - public.putenv(text); -- last in v13 - DROP OPERATOR IF EXISTS -- last in v13 - public.#@# (pg_catalog.int8, NONE), - public.#%# (pg_catalog.int8, NONE), - public.!=- (pg_catalog.int8, NONE), - public.#@%# (pg_catalog.int8, NONE);" - fi - psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$? - - # WITH OIDS is not supported anymore in v12, so remove support - # for any relations marked as such. - if [ $oldpgversion -lt 120000 ]; then - fix_sql="DO \$stmt\$ - DECLARE - rec text; - BEGIN - FOR rec in - SELECT oid::regclass::text - FROM pg_class - WHERE relname !~ '^pg_' - AND relhasoids - AND relkind in ('r','m') - ORDER BY 1 - LOOP - execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS'; - END LOOP; - END; \$stmt\$;" - psql -X -d regression -c "$fix_sql;" || psql_fix_sql_status=$? - fi + psql -X -d regression -f "test-upgrade.sql" || psql_fix_sql_status=$? # Handling of --extra-float-digits gets messy after v12. # Note that this changes the dumps from the old and new -- 2.17.0 --qD80nKKiJWXm4UaL Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v7-0002-wip-support-pg_upgrade-from-older-versions.patch" ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-02-05 18:51 Álvaro Herrera <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Álvaro Herrera @ 2025-02-05 18:51 UTC (permalink / raw) To: Euler Taveira <[email protected]>; +Cc: [email protected] Hello Euler, On 2024-Dec-17, Euler Taveira wrote: > Sometimes you need to inspect some debug messages from autovacuum worker but > you cannot apply the same setting for backends (that could rapidly fill the log > file). This proposal aims to change log_min_messages to have different log > levels depending on which backend type the message comes from. > > The syntax was changed from enum to string and it accepts a list of elements. > > Instead of enum, it now accepts a comma-separated list of elements (string). > Each element is LOGLEVEL:BACKENDTYPE. This format seems unintuitive. I would have thought you do it the other way around, "backendtype:loglevel" ... that seems more natural because it's like assigning the 'loglevel' value to the 'backendtype' element. SET log_min_messages TO 'checkpointer:debug2, autovacuum:debug1'; I dislike the array of names in variable.c. We already have an array in launch_backend.c (child_process_kinds), plus GetBackendTypeDesc in miscinit.c. Maybe not for this patch to clean up though. I think it should be acceptable to configure one global setting with exceptions for particular backend types: log_min_messages = WARNING, autovacuum:DEBUG1 Right now I think the code only accepts the unadorned log level if there are no other items in the list. I think the proposal downthread is to use the keyword ALL for this, log_min_messages = all:WARNING, autovacuum:DEBUG1 # I don't like this but I think it's inferior, because then "all" is not really "all", and I think it would be different if I had said log_min_messages = autovacuum:DEBUG1, all:WARNING # I don't like this because it looks like the "all" entry should override the one I set for autovacuum before, which frankly would not make sense to me. So I think these two lines, log_min_messages = WARNING, autovacuum:DEBUG1 log_min_messages = autovacuum:DEBUG1, WARNING should behave identically and mean "set the level for autovacuum to DEBUG1, and to any other backend type to WARNING. Also, I think it'd be better to reject duplicates in the list. Right now it looks like the last entry for one backend type overrides prior ones. I mean log_min_messages = autovacuum:DEBUG1, autovacuum:ERROR would set autovacuum to error, but that might be mistake prone if your string is long. So implementation-wise I suggest to initialize the whole newlogminmsgs array to -1, then scan the list of entries (saving an entry without backend type as the one to use later and) setting every backend type to the number specified; if we see trying to set a value that's already different from -1, throw error. After scanning the whole log_min_messages array, we scan the newlogminmsgs and set any entries that are still -1 to the value that we saved before. The new code in variable.c should be before the /* DATESTYLE */ comment rather than at the end of the file. You still have many XXX comments. Also, postgresql.conf should list the valid values for backendtype, as well as show an example of a valid setting. Please don't use ALLCAPS backend types in the docs, this looks ugly: > + Valid <literal>BACKENDTYPE</literal> values are <literal>ARCHIVER</literal>, > + <literal>AUTOVACUUM</literal>, <literal>BACKEND</literal>, > + <literal>BGWORKER</literal>, <literal>BGWRITER</literal>, > + <literal>CHECKPOINTER</literal>, <literal>LOGGER</literal>, > + <literal>SLOTSYNCWORKER</literal>, <literal>WALRECEIVER</literal>, > + <literal>WALSENDER</literal>, <literal>WALSUMMARIZER</literal>, and > + <literal>WALWRITER</literal>. -- Álvaro Herrera Breisgau, Deutschland — https://www.EnterpriseDB.com/ "No necesitamos banderas No reconocemos fronteras" (Jorge González) ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-03-05 00:33 Euler Taveira <[email protected]> parent: Álvaro Herrera <[email protected]> 0 siblings, 3 replies; 13+ messages in thread From: Euler Taveira @ 2025-03-05 00:33 UTC (permalink / raw) To: Alvaro Herrera <[email protected]>; +Cc: [email protected] On Wed, Feb 5, 2025, at 3:51 PM, Álvaro Herrera wrote: > On 2024-Dec-17, Euler Taveira wrote: > > > Sometimes you need to inspect some debug messages from autovacuum worker but > > you cannot apply the same setting for backends (that could rapidly fill the log > > file). This proposal aims to change log_min_messages to have different log > > levels depending on which backend type the message comes from. > > > > The syntax was changed from enum to string and it accepts a list of elements. > > > > Instead of enum, it now accepts a comma-separated list of elements (string). > > Each element is LOGLEVEL:BACKENDTYPE. > > This format seems unintuitive. I would have thought you do it the other > way around, "backendtype:loglevel" ... that seems more natural because > it's like assigning the 'loglevel' value to the 'backendtype' element. > SET log_min_messages TO 'checkpointer:debug2, autovacuum:debug1'; Alvaro, thanks for your feedback. Your suggestion makes sense to me. > I dislike the array of names in variable.c. We already have an array in > launch_backend.c (child_process_kinds), plus GetBackendTypeDesc in > miscinit.c. Maybe not for this patch to clean up though. I thought about using child_process_kinds but two details made me give up on the idea: (a) multiple names per backend type (for example, B_BACKEND, B_DEAD_END_BACKEND, B_STANDALONE_BACKEND) and (b) spaces into names. Maybe we should have a group into child_process_kinds but as you said it seems material for another patch. > I think it should be acceptable to configure one global setting with > exceptions for particular backend types: > > log_min_messages = WARNING, autovacuum:DEBUG1 > > Right now I think the code only accepts the unadorned log level if there > are no other items in the list. I think the proposal downthread is to > use the keyword ALL for this, > > log_min_messages = all:WARNING, autovacuum:DEBUG1 # I don't like this > > but I think it's inferior, because then "all" is not really "all", and I > think it would be different if I had said > > log_min_messages = autovacuum:DEBUG1, all:WARNING # I don't like this > > because it looks like the "all" entry should override the one I set for > autovacuum before, which frankly would not make sense to me. Good point. After reflection, I agree that "all" is not a good keyword. This patch turns backend type as optional so WARNING means apply this log level as a final step to the backend types that are not specified in the list. > So I think these two lines, > > log_min_messages = WARNING, autovacuum:DEBUG1 > log_min_messages = autovacuum:DEBUG1, WARNING > > should behave identically and mean "set the level for autovacuum to > DEBUG1, and to any other backend type to WARNING. Done. > Also, I think it'd be better to reject duplicates in the list. Right > now it looks like the last entry for one backend type overrides prior > ones. I mean > > log_min_messages = autovacuum:DEBUG1, autovacuum:ERROR > > would set autovacuum to error, but that might be mistake prone if your > string is long. So implementation-wise I suggest to initialize the > whole newlogminmsgs array to -1, then scan the list of entries (saving > an entry without backend type as the one to use later and) setting every > backend type to the number specified; if we see trying to set a value > that's already different from -1, throw error. After scanning the whole > log_min_messages array, we scan the newlogminmsgs and set any entries > that are still -1 to the value that we saved before. > > > The new code in variable.c should be before the /* DATESTYLE */ comment > rather than at the end of the file. It was added into the MISCELLANEOUS section. > > You still have many XXX comments. Also, postgresql.conf should list the > valid values for backendtype, as well as show an example of a valid > setting. Please don't use ALLCAPS backend types in the docs, this looks > ugly: > > > + Valid <literal>BACKENDTYPE</literal> values are <literal>ARCHIVER</literal>, > > + <literal>AUTOVACUUM</literal>, <literal>BACKEND</literal>, > > + <literal>BGWORKER</literal>, <literal>BGWRITER</literal>, > > + <literal>CHECKPOINTER</literal>, <literal>LOGGER</literal>, > > + <literal>SLOTSYNCWORKER</literal>, <literal>WALRECEIVER</literal>, > > + <literal>WALSENDER</literal>, <literal>WALSUMMARIZER</literal>, and > > + <literal>WALWRITER</literal>. Done. Just to recap what was changed: - patch was rebased - backend type is optional and means all unspecified backend types - generic log level (without backend type) is mandatory and the order it ppears is not important (it is applied for the remaining backend types) - fix Windows build - new tests to cover the changes -- Euler Taveira EDB https://www.enterprisedb.com/ Attachments: [text/x-patch] v2-0001-log_min_messages-per-backend-type.patch (21.2K, ../../[email protected]/3-v2-0001-log_min_messages-per-backend-type.patch) download | inline diff: From 0640ddb6e5510f1b600982331490188d20bfa7e9 Mon Sep 17 00:00:00 2001 From: Euler Taveira <[email protected]> Date: Mon, 11 Dec 2023 17:24:50 -0300 Subject: [PATCH v2] log_min_messages per backend type Change log_min_messages from a single element to a comma-separated list of elements. Each element is backendtype:loglevel. The backendtype are archiver, autovacuum (includes launcher and workers), backend, bgworker, bgwriter, checkpointer, logger, slotsyncworker, walreceiver, walsender, walsummarizer and walwriter. It should be part of this list a single log level that is applied as a final step to the backend types that are not informed. The old syntax (a single log level) is still accepted for backward compatibility. In this case, it means the informed log level is applied for the backend types that are not informed. The default log level is the same (WARNING) for all backend types. --- doc/src/sgml/config.sgml | 30 ++- src/backend/commands/extension.c | 2 +- src/backend/commands/variable.c | 187 ++++++++++++++++++ src/backend/utils/error/elog.c | 2 +- src/backend/utils/misc/guc_tables.c | 81 ++++++-- src/backend/utils/misc/postgresql.conf.sample | 1 + src/include/miscadmin.h | 2 + src/include/utils/guc.h | 2 +- src/include/utils/guc_hooks.h | 2 + src/include/utils/guc_tables.h | 4 + src/test/regress/expected/guc.out | 48 +++++ src/test/regress/sql/guc.sql | 16 ++ 12 files changed, 352 insertions(+), 25 deletions(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index d2fa5f7d1a9..3e8df85556d 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -6861,7 +6861,7 @@ local0.* /var/log/postgresql <variablelist> <varlistentry id="guc-log-min-messages" xreflabel="log_min_messages"> - <term><varname>log_min_messages</varname> (<type>enum</type>) + <term><varname>log_min_messages</varname> (<type>string</type>) <indexterm> <primary><varname>log_min_messages</varname> configuration parameter</primary> </indexterm> @@ -6870,14 +6870,26 @@ local0.* /var/log/postgresql <para> Controls which <link linkend="runtime-config-severity-levels">message levels</link> are written to the server log. - Valid values are <literal>DEBUG5</literal>, <literal>DEBUG4</literal>, - <literal>DEBUG3</literal>, <literal>DEBUG2</literal>, <literal>DEBUG1</literal>, - <literal>INFO</literal>, <literal>NOTICE</literal>, <literal>WARNING</literal>, - <literal>ERROR</literal>, <literal>LOG</literal>, <literal>FATAL</literal>, and - <literal>PANIC</literal>. Each level includes all the levels that - follow it. The later the level, the fewer messages are sent - to the log. The default is <literal>WARNING</literal>. Note that - <literal>LOG</literal> has a different rank here than in + Valid values are a comma-separated list of <literal>backendtype:level</literal> + and a single <literal>level</literal>. The list allows it to use + different levels per backend type. + Valid <literal>backendtype</literal> values are <literal>archiver</literal>, + <literal>autovacuum</literal>, <literal>backend</literal>, + <literal>bgworker</literal>, <literal>bgwriter</literal>, + <literal>checkpointer</literal>, <literal>logger</literal>, + <literal>slotsyncworker</literal>, <literal>walreceiver</literal>, + <literal>walsender</literal>, <literal>walsummarizer</literal>, and + <literal>walwriter</literal>. + Valid <literal>LEVEL</literal> values are <literal>DEBUG5</literal>, + <literal>DEBUG4</literal>, <literal>DEBUG3</literal>, <literal>DEBUG2</literal>, + <literal>DEBUG1</literal>, <literal>INFO</literal>, <literal>NOTICE</literal>, + <literal>WARNING</literal>, <literal>ERROR</literal>, <literal>LOG</literal>, + <literal>FATAL</literal>, and <literal>PANIC</literal>. Each level includes + all the levels that follow it. The later the level, the fewer messages are sent + to the log. The single <literal>LEVEL</literal> is mandatory and it is + assigned to the backend types that are not specified in the list. The + default is <literal>WARNING</literal> for all backend types. + Note that <literal>LOG</literal> has a different rank here than in <xref linkend="guc-client-min-messages"/>. Only superusers and users with the appropriate <literal>SET</literal> privilege can change this setting. diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index d9bb4ce5f1e..93923c26a7e 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -1059,7 +1059,7 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control, (void) set_config_option("client_min_messages", "warning", PGC_USERSET, PGC_S_SESSION, GUC_ACTION_SAVE, true, 0, false); - if (log_min_messages < WARNING) + if (log_min_messages[MyBackendType] < WARNING) (void) set_config_option_ext("log_min_messages", "warning", PGC_SUSET, PGC_S_SESSION, BOOTSTRAP_SUPERUSERID, diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 4ad6e236d69..0f646298bf1 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -35,6 +35,7 @@ #include "utils/datetime.h" #include "utils/fmgrprotos.h" #include "utils/guc_hooks.h" +#include "utils/guc_tables.h" #include "utils/snapmgr.h" #include "utils/syscache.h" #include "utils/timestamp.h" @@ -1271,3 +1272,189 @@ check_ssl(bool *newval, void **extra, GucSource source) #endif return true; } + +/* + * GUC check_hook for log_min_messages + * + * The parsing consists of a comma-separated list of BACKENDTYPENAME:LEVEL + * elements. BACKENDTYPENAME is log_min_messages_backend_types. LEVEL is + * server_message_level_options. A single LEVEL element should be part of this + * list and it is applied as a final step to the backend types that are not + * specified. For backward compatibility, the old syntax is still accepted and + * it means to apply this level for all backend types. + */ +bool +check_log_min_messages(char **newval, void **extra, GucSource source) +{ + char *rawstring; + List *elemlist; + ListCell *l; + int newlevels[BACKEND_NUM_TYPES]; + bool assigned[BACKEND_NUM_TYPES]; + int genericlevel = -1; /* -1 means not assigned */ + + /* Initialize the array. */ + memset(newlevels, WARNING, BACKEND_NUM_TYPES * sizeof(int)); + memset(assigned, false, BACKEND_NUM_TYPES * sizeof(bool)); + + /* Need a modifiable copy of string. */ + rawstring = pstrdup(*newval); + + /* Parse string into list of identifiers. */ + if (!SplitGUCList(rawstring, ',', &elemlist)) + { + /* syntax error in list */ + GUC_check_errdetail("List syntax is invalid."); + pfree(rawstring); + list_free(elemlist); + return false; + } + + /* Validate and assign log level and backend type. */ + foreach(l, elemlist) + { + char *tok = (char *) lfirst(l); + char *sep; + const struct config_enum_entry *entry; + + /* + * Check whether there is a backend type following the log level. If + * there is no separator, it means this log level should be applied + * for all backend types (backward compatibility). + */ + sep = strchr(tok, ':'); + if (sep == NULL) + { + bool found = false; + + /* Reject duplicates for generic log level. */ + if (genericlevel != -1) + { + GUC_check_errdetail("Generic log level was already assigned."); + pfree(rawstring); + list_free(elemlist); + return false; + } + + /* Is the log level valid? */ + for (entry = server_message_level_options; entry && entry->name; entry++) + { + if (pg_strcasecmp(entry->name, tok) == 0) + { + genericlevel = entry->val; + found = true; + break; + } + } + + if (!found) + { + GUC_check_errdetail("Unrecognized log level: \"%s\".", tok); + pfree(rawstring); + list_free(elemlist); + return false; + } + } + else + { + char *loglevel; + char *btype; + bool found = false; + + btype = palloc((sep - tok) + 1); + memcpy(btype, tok, sep - tok); + btype[sep - tok] = '\0'; + loglevel = pstrdup(sep + 1); + + /* Is the log level valid? */ + for (entry = server_message_level_options; entry && entry->name; entry++) + { + if (pg_strcasecmp(entry->name, loglevel) == 0) + { + found = true; + break; + } + } + + if (!found) + { + GUC_check_errdetail("Unrecognized log level: \"%s\".", loglevel); + pfree(rawstring); + list_free(elemlist); + return false; + } + + /* + * Is the backend type name valid? There might be multiple entries + * per backend type, don't bail out when find first occurrence. + */ + found = false; + for (int i = 0; i < BACKEND_NUM_TYPES; i++) + { + if (pg_strcasecmp(log_min_messages_backend_types[i], btype) == 0) + { + newlevels[i] = entry->val; + assigned[i] = true; + found = true; + } + } + + if (!found) + { + GUC_check_errdetail("Unrecognized backend type: \"%s\".", btype); + pfree(rawstring); + list_free(elemlist); + return false; + } + } + } + + /* + * Generic log level must be specified. It is a good idea to specify a + * generic log level to make it clear that it is the fallback value. + * Although, we can document it, it might confuse users that used to + * specify a single log level in prior releases. + */ + if (genericlevel == -1) + { + GUC_check_errdetail("Generic log level was not defined."); + pfree(rawstring); + list_free(elemlist); + return false; + } + + /* + * Apply the generic log level (the one without a backend type) after all + * of the specific backend type have been assigned. Hence, it doesn't + * matter the order you specify the generic log level, the final result + * will be the same. + */ + for (int i = 0; i < BACKEND_NUM_TYPES; i++) + { + if (!assigned[i]) + newlevels[i] = genericlevel; + } + + pfree(rawstring); + list_free(elemlist); + + /* + * Pass back data for assign_log_min_messages to use. + */ + *extra = guc_malloc(LOG, BACKEND_NUM_TYPES * sizeof(int)); + if (!*extra) + return false; + memcpy(*extra, newlevels, BACKEND_NUM_TYPES * sizeof(int)); + + return true; +} + +/* + * GUC assign_hook for log_min_messages + */ +void +assign_log_min_messages(const char *newval, void *extra) +{ + for (int i = 0; i < BACKEND_NUM_TYPES; i++) + log_min_messages[i] = ((int *) extra)[i]; +} diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 860bbd40d42..fc5aedab0c8 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -234,7 +234,7 @@ is_log_level_output(int elevel, int log_min_level) static inline bool should_output_to_server(int elevel) { - return is_log_level_output(elevel, log_min_messages); + return is_log_level_output(elevel, log_min_messages[MyBackendType]); } /* diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index ad25cbb39c5..9d38474fc79 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -139,7 +139,7 @@ static const struct config_enum_entry client_message_level_options[] = { {NULL, 0, false} }; -static const struct config_enum_entry server_message_level_options[] = { +const struct config_enum_entry server_message_level_options[] = { {"debug5", DEBUG5, false}, {"debug4", DEBUG4, false}, {"debug3", DEBUG3, false}, @@ -521,7 +521,6 @@ static bool default_with_oids = false; bool current_role_is_superuser; int log_min_error_statement = ERROR; -int log_min_messages = WARNING; int client_min_messages = NOTICE; int log_min_duration_sample = -1; int log_min_duration_statement = -1; @@ -579,6 +578,7 @@ static char *server_version_string; static int server_version_num; static char *debug_io_direct_string; static char *restrict_nonsystem_relation_kind_string; +static char *log_min_messages_string; #ifdef HAVE_SYSLOG #define DEFAULT_SYSLOG_FACILITY LOG_LOCAL0 @@ -623,6 +623,60 @@ char *role_string; /* should be static, but guc.c needs to get at this */ bool in_hot_standby_guc; +/* + * This must match enum BackendType! It should be static, but + * commands/variable.c needs to get at this. + */ +int log_min_messages[] = { + [B_INVALID] = WARNING, + [B_BACKEND] = WARNING, + [B_DEAD_END_BACKEND] = WARNING, + [B_AUTOVAC_LAUNCHER] = WARNING, + [B_AUTOVAC_WORKER] = WARNING, + [B_BG_WORKER] = WARNING, + [B_WAL_SENDER] = WARNING, + [B_SLOTSYNC_WORKER] = WARNING, + [B_STANDALONE_BACKEND] = WARNING, + [B_ARCHIVER] = WARNING, + [B_BG_WRITER] = WARNING, + [B_CHECKPOINTER] = WARNING, + [B_STARTUP] = WARNING, + [B_WAL_RECEIVER] = WARNING, + [B_WAL_SUMMARIZER] = WARNING, + [B_WAL_WRITER] = WARNING, + [B_LOGGER] = WARNING, +}; + +StaticAssertDecl(lengthof(log_min_messages) == BACKEND_NUM_TYPES, + "array length mismatch"); + +/* + * This must match enum BackendType! It might be in commands/variable.c but for + * convenience it is near log_min_messages. + */ +const char *const log_min_messages_backend_types[] = { + [B_INVALID] = "backend", /* XXX same as backend? */ + [B_BACKEND] = "backend", + [B_DEAD_END_BACKEND] = "backend", /* XXX same as backend? */ + [B_AUTOVAC_LAUNCHER] = "autovacuum", + [B_AUTOVAC_WORKER] = "autovacuum", + [B_BG_WORKER] = "bgworker", + [B_WAL_SENDER] = "walsender", + [B_SLOTSYNC_WORKER] = "slotsyncworker", + [B_STANDALONE_BACKEND] = "backend", /* XXX same as backend? */ + [B_ARCHIVER] = "archiver", + [B_BG_WRITER] = "bgwriter", + [B_CHECKPOINTER] = "checkpointer", + [B_STARTUP] = "backend", /* XXX same as backend? */ + [B_WAL_RECEIVER] = "walreceiver", + [B_WAL_SUMMARIZER] = "walsummarizer", + [B_WAL_WRITER] = "walwriter", + [B_LOGGER] = "logger", +}; + +StaticAssertDecl(lengthof(log_min_messages_backend_types) == BACKEND_NUM_TYPES, + "array length mismatch"); + /* * Displayable names for context types (enum GucContext) @@ -4223,6 +4277,18 @@ struct config_string ConfigureNamesString[] = check_client_encoding, assign_client_encoding, NULL }, + { + {"log_min_messages", PGC_SUSET, LOGGING_WHEN, + gettext_noop("Sets the message levels that are logged."), + gettext_noop("Each level includes all the levels that follow it. The later" + " the level, the fewer messages are sent."), + GUC_LIST_INPUT + }, + &log_min_messages_string, + "WARNING", + check_log_min_messages, assign_log_min_messages, NULL + }, + { {"log_line_prefix", PGC_SIGHUP, LOGGING_WHAT, gettext_noop("Controls information prefixed to each log line."), @@ -5011,17 +5077,6 @@ struct config_enum ConfigureNamesEnum[] = NULL, NULL, NULL }, - { - {"log_min_messages", PGC_SUSET, LOGGING_WHEN, - gettext_noop("Sets the message levels that are logged."), - gettext_noop("Each level includes all the levels that follow it. The later" - " the level, the fewer messages are sent.") - }, - &log_min_messages, - WARNING, server_message_level_options, - NULL, NULL, NULL - }, - { {"log_min_error_statement", PGC_SUSET, LOGGING_WHEN, gettext_noop("Causes all statements generating error at or above this level to be logged."), diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 2d1de9c37bd..c99e1fb90ae 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -526,6 +526,7 @@ # log # fatal # panic + # or a comma-separated list of backend_type:level #log_min_error_statement = error # values in order of decreasing detail: # debug5 diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h index a2b63495eec..36b0b82cf3e 100644 --- a/src/include/miscadmin.h +++ b/src/include/miscadmin.h @@ -332,6 +332,8 @@ extern void SwitchBackToLocalLatch(void); * * If you add entries, please also update the child_process_kinds array in * launch_backend.c. + * XXX If you add a new backend type or change the order, update + * log_min_messages because it relies on this order to work correctly. */ typedef enum BackendType { diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 1233e07d7da..bb23ca65449 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -271,7 +271,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 int log_min_messages; +extern PGDLLIMPORT int log_min_messages[]; extern PGDLLIMPORT int client_min_messages; extern PGDLLIMPORT int log_min_duration_sample; extern PGDLLIMPORT int log_min_duration_statement; diff --git a/src/include/utils/guc_hooks.h b/src/include/utils/guc_hooks.h index 951451a9765..cf27960e239 100644 --- a/src/include/utils/guc_hooks.h +++ b/src/include/utils/guc_hooks.h @@ -176,5 +176,7 @@ extern bool check_synchronized_standby_slots(char **newval, void **extra, extern void assign_synchronized_standby_slots(const char *newval, void *extra); extern bool check_idle_replication_slot_timeout(int *newval, void **extra, GucSource source); +extern bool check_log_min_messages(char **newval, void **extra, GucSource source); +extern void assign_log_min_messages(const char *newval, void *extra); #endif /* GUC_HOOKS_H */ diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index ab47145ec36..8a60ec5997a 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -297,6 +297,10 @@ struct config_enum void *reset_extra; }; +/* log_min_messages */ +extern PGDLLIMPORT const char *const log_min_messages_backend_types[]; +extern PGDLLIMPORT const struct config_enum_entry server_message_level_options[]; + /* constant tables corresponding to enums above and in guc.h */ extern PGDLLIMPORT const char *const config_group_names[]; extern PGDLLIMPORT const char *const config_type_names[]; diff --git a/src/test/regress/expected/guc.out b/src/test/regress/expected/guc.out index 7f9e29c765c..7572e0addbc 100644 --- a/src/test/regress/expected/guc.out +++ b/src/test/regress/expected/guc.out @@ -913,3 +913,51 @@ SELECT name FROM tab_settings_flags (0 rows) DROP TABLE tab_settings_flags; +-- Test log_min_messages +SET log_min_messages TO fatal; +SHOW log_min_messages; + log_min_messages +------------------ + fatal +(1 row) + +SET log_min_messages TO 'fatal'; +SHOW log_min_messages; + log_min_messages +------------------ + fatal +(1 row) + +SET log_min_messages TO 'checkpointer:debug2, autovacuum:debug1'; --fail +ERROR: invalid value for parameter "log_min_messages": "checkpointer:debug2, autovacuum:debug1" +DETAIL: Generic log level was not defined. +SET log_min_messages TO 'debug1, backend:error, fatal'; -- fail +ERROR: invalid value for parameter "log_min_messages": "debug1, backend:error, fatal" +DETAIL: Generic log level was already assigned. +SET log_min_messages TO 'backend:error, foo:fatal, archiver:debug1'; -- fail +ERROR: invalid value for parameter "log_min_messages": "backend:error, foo:fatal, archiver:debug1" +DETAIL: Unrecognized backend type: "foo". +SET log_min_messages TO 'backend:error, checkpointer:bar, archiver:debug1'; -- fail +ERROR: invalid value for parameter "log_min_messages": "backend:error, checkpointer:bar, archiver:debug1" +DETAIL: Unrecognized log level: "bar". +SET log_min_messages TO 'backend:error, checkpointer:debug3, fatal, archiver:debug2, autovacuum:debug1, walsender:debug3'; +SHOW log_min_messages; + log_min_messages +------------------------------------------------------------------------------------------------- + backend:error, checkpointer:debug3, fatal, archiver:debug2, autovacuum:debug1, walsender:debug3 +(1 row) + +SET log_min_messages TO 'warning, autovacuum:debug1'; +SHOW log_min_messages; + log_min_messages +---------------------------- + warning, autovacuum:debug1 +(1 row) + +SET log_min_messages TO 'autovacuum:debug1, warning'; +SHOW log_min_messages; + log_min_messages +---------------------------- + autovacuum:debug1, warning +(1 row) + diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql index f65f84a2632..e9dddb4e72d 100644 --- a/src/test/regress/sql/guc.sql +++ b/src/test/regress/sql/guc.sql @@ -368,3 +368,19 @@ SELECT name FROM tab_settings_flags WHERE no_reset AND NOT no_reset_all ORDER BY 1; DROP TABLE tab_settings_flags; + +-- Test log_min_messages +SET log_min_messages TO fatal; +SHOW log_min_messages; +SET log_min_messages TO 'fatal'; +SHOW log_min_messages; +SET log_min_messages TO 'checkpointer:debug2, autovacuum:debug1'; --fail +SET log_min_messages TO 'debug1, backend:error, fatal'; -- fail +SET log_min_messages TO 'backend:error, foo:fatal, archiver:debug1'; -- fail +SET log_min_messages TO 'backend:error, checkpointer:bar, archiver:debug1'; -- fail +SET log_min_messages TO 'backend:error, checkpointer:debug3, fatal, archiver:debug2, autovacuum:debug1, walsender:debug3'; +SHOW log_min_messages; +SET log_min_messages TO 'warning, autovacuum:debug1'; +SHOW log_min_messages; +SET log_min_messages TO 'autovacuum:debug1, warning'; +SHOW log_min_messages; -- 2.39.5 ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-03-05 16:40 Andrew Dunstan <[email protected]> parent: Euler Taveira <[email protected]> 2 siblings, 2 replies; 13+ messages in thread From: Andrew Dunstan @ 2025-03-05 16:40 UTC (permalink / raw) To: Euler Taveira <[email protected]>; Alvaro Herrera <[email protected]>; +Cc: [email protected] On 2025-03-04 Tu 7:33 PM, Euler Taveira wrote: >> I think it should be acceptable to configure one global setting with >> exceptions for particular backend types: >> >> log_min_messages = WARNING, autovacuum:DEBUG1 >> >> Right now I think the code only accepts the unadorned log level if there >> are no other items in the list. I think the proposal downthread is to >> use the keyword ALL for this, >> >> log_min_messages = all:WARNING, autovacuum:DEBUG1 # I don't like this >> >> but I think it's inferior, because then "all" is not really "all", and I >> think it would be different if I had said >> >> log_min_messages = autovacuum:DEBUG1, all:WARNING # I don't like this >> >> because it looks like the "all" entry should override the one I set for >> autovacuum before, which frankly would not make sense to me. > > Good point. After reflection, I agree that "all" is not a good keyword. > This patch turns backend type as optional so WARNING means apply this > log level as a final step to the backend types that are not specified in > the list. > >> So I think these two lines, >> >> log_min_messages = WARNING, autovacuum:DEBUG1 >> log_min_messages = autovacuum:DEBUG1, WARNING >> >> should behave identically and mean "set the level for autovacuum to >> DEBUG1, and to any other backend type to WARNING. > > Done. Just bikeshedding a bit ... I'm not mad keen on this design. I think the value should be either a single setting like "WARNING" or a set of type:setting pairs. I agree that "all" is a bad name, but I think "default" would make sense. I can live with it but I think this just looks a bit odd. cheers andrew -- Andrew Dunstan EDB:https://www.enterprisedb.com ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-03-06 02:53 Fujii Masao <[email protected]> parent: Euler Taveira <[email protected]> 2 siblings, 0 replies; 13+ messages in thread From: Fujii Masao @ 2025-03-06 02:53 UTC (permalink / raw) To: Euler Taveira <[email protected]>; Alvaro Herrera <[email protected]>; +Cc: [email protected] On 2025/03/05 9:33, Euler Taveira wrote: >> > + Valid <literal>BACKENDTYPE</literal> values are <literal>ARCHIVER</literal>, >> > + <literal>AUTOVACUUM</literal>, <literal>BACKEND</literal>, >> > + <literal>BGWORKER</literal>, <literal>BGWRITER</literal>, >> > + <literal>CHECKPOINTER</literal>, <literal>LOGGER</literal>, >> > + <literal>SLOTSYNCWORKER</literal>, <literal>WALRECEIVER</literal>, >> > + <literal>WALSENDER</literal>, <literal>WALSUMMARIZER</literal>, and >> > + <literal>WALWRITER</literal>. What about postmaster? For parallel workers launched for parallel queries, should they follow the backend's log level or the background worker's? Since they operate as part of a parallel query executed by a backend, it seems more logical for them to follow the backend's setting. + [B_CHECKPOINTER] = "checkpointer", + [B_STARTUP] = "backend", /* XXX same as backend? */ I like the idea of allowing log levels to be set per process. There were times I wanted to use debug5 specifically for the startup process when troubleshooting WAL replay. It would be helpful to distinguish the startup process from a regular backend, so we can set its log level independently. Regards, -- Fujii Masao Advanced Computing Technology Center Research and Development Headquarters NTT DATA CORPORATION ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-03-06 13:20 Matheus Alcantara <[email protected]> parent: Andrew Dunstan <[email protected]> 1 sibling, 0 replies; 13+ messages in thread From: Matheus Alcantara @ 2025-03-06 13:20 UTC (permalink / raw) To: Andrew Dunstan <[email protected]>; Euler Taveira <[email protected]>; Alvaro Herrera <[email protected]>; +Cc: [email protected] Hi, > > On 2025-03-04 Tu 7:33 PM, Euler Taveira wrote: >>> I think it should be acceptable to configure one global setting with >>> exceptions for particular backend types: >>> >>> log_min_messages = WARNING, autovacuum:DEBUG1 >>> >>> Right now I think the code only accepts the unadorned log level if >>> there >>> are no other items in the list. I think the proposal downthread is to >>> use the keyword ALL for this, >>> >>> log_min_messages = all:WARNING, autovacuum:DEBUG1 # I don't >>> like this >>> >>> but I think it's inferior, because then "all" is not really "all", >>> and I >>> think it would be different if I had said >>> >>> log_min_messages = autovacuum:DEBUG1, all:WARNING # I don't >>> like this >>> >>> because it looks like the "all" entry should override the one I set >>> for >>> autovacuum before, which frankly would not make sense to me. >> >> Good point. After reflection, I agree that "all" is not a good keyword. >> This patch turns backend type as optional so WARNING means apply this >> log level as a final step to the backend types that are not >> specified in >> the list. >> >>> So I think these two lines, >>> >>> log_min_messages = WARNING, autovacuum:DEBUG1 >>> log_min_messages = autovacuum:DEBUG1, WARNING >>> >>> should behave identically and mean "set the level for autovacuum to >>> DEBUG1, and to any other backend type to WARNING. >> >> Done. > > > Just bikeshedding a bit ... > > I'm not mad keen on this design. I think the value should be either a > single setting like "WARNING" or a set of type:setting pairs. I agree > that "all" is a bad name, but I think "default" would make sense. > > I can live with it but I think this just looks a bit odd. > Just bringing some thoughts about it... How about using something like *:WARNING? I'm not sure if it could also be confusing as the "all" keyword, but I think it could also be interpreted as "anything else use WARNING". -- Matheus Alcantara ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-03-06 13:33 Andres Freund <[email protected]> parent: Euler Taveira <[email protected]> 2 siblings, 1 reply; 13+ messages in thread From: Andres Freund @ 2025-03-06 13:33 UTC (permalink / raw) To: Euler Taveira <[email protected]>; +Cc: Alvaro Herrera <[email protected]>; [email protected] Hi, On 2025-03-04 21:33:39 -0300, Euler Taveira wrote: > +/* > + * This must match enum BackendType! It should be static, but > + * commands/variable.c needs to get at this. > + */ > +int log_min_messages[] = { > + [B_INVALID] = WARNING, > + [B_BACKEND] = WARNING, > + [B_DEAD_END_BACKEND] = WARNING, > + [B_AUTOVAC_LAUNCHER] = WARNING, > + [B_AUTOVAC_WORKER] = WARNING, > + [B_BG_WORKER] = WARNING, > + [B_WAL_SENDER] = WARNING, > + [B_SLOTSYNC_WORKER] = WARNING, > + [B_STANDALONE_BACKEND] = WARNING, > + [B_ARCHIVER] = WARNING, > + [B_BG_WRITER] = WARNING, > + [B_CHECKPOINTER] = WARNING, > + [B_STARTUP] = WARNING, > + [B_WAL_RECEIVER] = WARNING, > + [B_WAL_SUMMARIZER] = WARNING, > + [B_WAL_WRITER] = WARNING, > + [B_LOGGER] = WARNING, > +}; > +StaticAssertDecl(lengthof(log_min_messages) == BACKEND_NUM_TYPES, > + "array length mismatch"); > + > +/* > + * This must match enum BackendType! It might be in commands/variable.c but for > + * convenience it is near log_min_messages. > + */ > +const char *const log_min_messages_backend_types[] = { > + [B_INVALID] = "backend", /* XXX same as backend? */ > + [B_BACKEND] = "backend", > + [B_DEAD_END_BACKEND] = "backend", /* XXX same as backend? */ > + [B_AUTOVAC_LAUNCHER] = "autovacuum", > + [B_AUTOVAC_WORKER] = "autovacuum", > + [B_BG_WORKER] = "bgworker", > + [B_WAL_SENDER] = "walsender", > + [B_SLOTSYNC_WORKER] = "slotsyncworker", > + [B_STANDALONE_BACKEND] = "backend", /* XXX same as backend? */ > + [B_ARCHIVER] = "archiver", > + [B_BG_WRITER] = "bgwriter", > + [B_CHECKPOINTER] = "checkpointer", > + [B_STARTUP] = "backend", /* XXX same as backend? */ Huh, the startup process is among the most crucial things to monitor? > + [B_WAL_RECEIVER] = "walreceiver", > + [B_WAL_SUMMARIZER] = "walsummarizer", > + [B_WAL_WRITER] = "walwriter", > + [B_LOGGER] = "logger", > +}; > + > +StaticAssertDecl(lengthof(log_min_messages_backend_types) == BACKEND_NUM_TYPES, > + "array length mismatch"); > + I don't know what I think about the whole patch, but I do want to voice *strong* opposition to duplicating a list of all backend types into multiple places. It's already painfull enough to add a new backend type, without having to pointlessly go around and manually add a new backend type to mulltiple arrays that have completely predictable content. Greetings, Andres Freund ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-03-06 21:33 Euler Taveira <[email protected]> parent: Andrew Dunstan <[email protected]> 1 sibling, 0 replies; 13+ messages in thread From: Euler Taveira @ 2025-03-06 21:33 UTC (permalink / raw) To: Andrew Dunstan <[email protected]>; Alvaro Herrera <[email protected]>; +Cc: [email protected] On Wed, Mar 5, 2025, at 1:40 PM, Andrew Dunstan wrote: > Just bikeshedding a bit ... > > I'm not mad keen on this design. I think the value should be either a single setting like "WARNING" or a set of type:setting pairs. I agree that "all" is a bad name, but I think "default" would make sense. > One of my main concerns was a clear interface. I think "default" is less confusing than "all". Your suggestion about single or list is aligned with what Alvaro suggested. IIUC you are suggesting default:loglevel only if it is part of the list; the single loglevel shouldn't contain the backend type to keep the backward compatibility. The advantage of your proposal is that it make it clear what the fallback log level is. However, someone could be confused asking if the "default" is a valid backend type and if there is a difference between WARNING and default:WARNING (both is a fallback for non-specified backend type elements). -- Euler Taveira EDB https://www.enterprisedb.com/ ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-07-31 14:19 Euler Taveira <[email protected]> parent: Andres Freund <[email protected]> 0 siblings, 2 replies; 13+ messages in thread From: Euler Taveira @ 2025-07-31 14:19 UTC (permalink / raw) To: Andres Freund <[email protected]>; +Cc: Alvaro Herrera <[email protected]>; [email protected] On Thu, Mar 6, 2025, at 10:33 AM, Andres Freund wrote: > Huh, the startup process is among the most crucial things to monitor? > Good point. Fixed. After collecting some suggestions, I'm attaching a new patch contains the following changes: - patch was rebased - include Alvaro's patch (v2-0001) [1] as a basis for this patch - add ioworker as new backend type - add startup as new backend type per Andres suggestion - small changes into documentation > I don't know what I think about the whole patch, but I do want to voice > *strong* opposition to duplicating a list of all backend types into multiple > places. It's already painfull enough to add a new backend type, without having > to pointlessly go around and manually add a new backend type to mulltiple > arrays that have completely predictable content. > I'm including Alvaro's patch as is just to make the CF bot happy and to illustrate how it would be if we adopt his solution to centralize the list of backend types. I think Alvaro's proposal overcomes the objection [2], right? [1] https://www.postgresql.org/message-id/[email protected] [2] https://www.postgresql.org/message-id/y5tgui75jrcj6mm5nmoq4yqwage2432akx4kp2ogtcnim3wskx@2ipmtfi4qvp... -- Euler Taveira EDB https://www.enterprisedb.com/ Attachments: [text/x-patch] v3-0001-Create-a-separate-file-listing-backend-types.patch (7.0K, ../../[email protected]/2-v3-0001-Create-a-separate-file-listing-backend-types.patch) download | inline diff: From ec409dada269cf54b9bce16cae473a46b2400598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Herrera?= <[email protected]> Date: Tue, 15 Jul 2025 18:19:27 +0200 Subject: [PATCH v3 1/2] Create a separate file listing backend types Use our established coding pattern to reduce maintenance pain when adding other per-process-type characteristics. Like PG_KEYWORD, PG_CMDTAG, PG_RMGR. --- src/backend/postmaster/launch_backend.c | 32 ++------------ src/backend/utils/init/miscinit.c | 59 ++----------------------- src/include/postmaster/proctypelist.h | 50 +++++++++++++++++++++ 3 files changed, 58 insertions(+), 83 deletions(-) create mode 100644 src/include/postmaster/proctypelist.h diff --git a/src/backend/postmaster/launch_backend.c b/src/backend/postmaster/launch_backend.c index bf6b55ee830..8b2f1a0cf41 100644 --- a/src/backend/postmaster/launch_backend.c +++ b/src/backend/postmaster/launch_backend.c @@ -177,34 +177,10 @@ typedef struct } child_process_kind; static child_process_kind child_process_kinds[] = { - [B_INVALID] = {"invalid", NULL, false}, - - [B_BACKEND] = {"backend", BackendMain, true}, - [B_DEAD_END_BACKEND] = {"dead-end backend", BackendMain, true}, - [B_AUTOVAC_LAUNCHER] = {"autovacuum launcher", AutoVacLauncherMain, true}, - [B_AUTOVAC_WORKER] = {"autovacuum worker", AutoVacWorkerMain, true}, - [B_BG_WORKER] = {"bgworker", BackgroundWorkerMain, true}, - - /* - * WAL senders start their life as regular backend processes, and change - * their type after authenticating the client for replication. We list it - * here for PostmasterChildName() but cannot launch them directly. - */ - [B_WAL_SENDER] = {"wal sender", NULL, true}, - [B_SLOTSYNC_WORKER] = {"slot sync worker", ReplSlotSyncWorkerMain, true}, - - [B_STANDALONE_BACKEND] = {"standalone backend", NULL, false}, - - [B_ARCHIVER] = {"archiver", PgArchiverMain, true}, - [B_BG_WRITER] = {"bgwriter", BackgroundWriterMain, true}, - [B_CHECKPOINTER] = {"checkpointer", CheckpointerMain, true}, - [B_IO_WORKER] = {"io_worker", IoWorkerMain, true}, - [B_STARTUP] = {"startup", StartupProcessMain, true}, - [B_WAL_RECEIVER] = {"wal_receiver", WalReceiverMain, true}, - [B_WAL_SUMMARIZER] = {"wal_summarizer", WalSummarizerMain, true}, - [B_WAL_WRITER] = {"wal_writer", WalWriterMain, true}, - - [B_LOGGER] = {"syslogger", SysLoggerMain, false}, +#define PG_PROCTYPE(bktype, description, main_func, shmem_attach) \ + [bktype] = {description, main_func, shmem_attach}, +#include "postmaster/proctypelist.h" +#undef PG_PROCTYPE }; const char * diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 43b4dbccc3d..dec220a61f5 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -266,62 +266,11 @@ GetBackendTypeDesc(BackendType backendType) switch (backendType) { - case B_INVALID: - backendDesc = gettext_noop("not initialized"); - break; - case B_ARCHIVER: - backendDesc = gettext_noop("archiver"); - break; - case B_AUTOVAC_LAUNCHER: - backendDesc = gettext_noop("autovacuum launcher"); - break; - case B_AUTOVAC_WORKER: - backendDesc = gettext_noop("autovacuum worker"); - break; - case B_BACKEND: - backendDesc = gettext_noop("client backend"); - break; - case B_DEAD_END_BACKEND: - backendDesc = gettext_noop("dead-end client backend"); - break; - case B_BG_WORKER: - backendDesc = gettext_noop("background worker"); - break; - case B_BG_WRITER: - backendDesc = gettext_noop("background writer"); - break; - case B_CHECKPOINTER: - backendDesc = gettext_noop("checkpointer"); - break; - case B_IO_WORKER: - backendDesc = gettext_noop("io worker"); - break; - case B_LOGGER: - backendDesc = gettext_noop("logger"); - break; - case B_SLOTSYNC_WORKER: - backendDesc = gettext_noop("slotsync worker"); - break; - case B_STANDALONE_BACKEND: - backendDesc = gettext_noop("standalone backend"); - break; - case B_STARTUP: - backendDesc = gettext_noop("startup"); - break; - case B_WAL_RECEIVER: - backendDesc = gettext_noop("walreceiver"); - break; - case B_WAL_SENDER: - backendDesc = gettext_noop("walsender"); - break; - case B_WAL_SUMMARIZER: - backendDesc = gettext_noop("walsummarizer"); - break; - case B_WAL_WRITER: - backendDesc = gettext_noop("walwriter"); - break; +#define PG_PROCTYPE(bktype, description, main_func, shmem_attach) \ + case bktype: backendDesc = gettext_noop(description); break; +#include "postmaster/proctypelist.h" +#undef PG_PROCTYPE } - return backendDesc; } diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h new file mode 100644 index 00000000000..919f00bb3a7 --- /dev/null +++ b/src/include/postmaster/proctypelist.h @@ -0,0 +1,50 @@ +/*------------------------------------------------------------------------- + * + * proctypelist.h + * + * The list of process types is kept on its own source file for use by + * automatic tools. The exact representation of a process type is + * determined by the PG_PROCTYPE macro, which is not defined in this + * file; it can be defined by the caller for special purposes. + * + * Portions Copyright (c) 1996-2025, PostgreSQL Global Development Group + * Portions Copyright (c) 1994, Regents of the University of California + * + * IDENTIFICATION + * src/include/postmaster/proctypelist.h + * + *------------------------------------------------------------------------- + */ + +/* there is deliberately not an #ifndef PROCTYPELIST_H here */ + +/* + * WAL senders start their life as regular backend processes, and change their + * type after authenticating the client for replication. We list it here for + * PostmasterChildName() but cannot launch them directly. + */ + +/* + * List of process types (symbol, description, Main function, shmem_attach) + * entries. + */ + +/* bktype, description, main_func, shmem_attach */ +PG_PROCTYPE(B_ARCHIVER, "archiver", PgArchiverMain, true) +PG_PROCTYPE(B_AUTOVAC_LAUNCHER, "autovacuum launcher", AutoVacLauncherMain, true) +PG_PROCTYPE(B_AUTOVAC_WORKER, "autovacuum worker", AutoVacWorkerMain, true) +PG_PROCTYPE(B_BACKEND, "client backend", BackendMain, true) +PG_PROCTYPE(B_BG_WORKER, "background worker", BackgroundWorkerMain, true) +PG_PROCTYPE(B_BG_WRITER, "background writer", BackgroundWriterMain, true) +PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", CheckpointerMain, true) +PG_PROCTYPE(B_DEAD_END_BACKEND, "dead-end client backend", BackendMain, true) +PG_PROCTYPE(B_INVALID, "unrecognized", NULL, false) +PG_PROCTYPE(B_IO_WORKER, "io worker", IoWorkerMain, true) +PG_PROCTYPE(B_LOGGER, "syslogger", SysLoggerMain, false) +PG_PROCTYPE(B_SLOTSYNC_WORKER, "slotsync worker", ReplSlotSyncWorkerMain, true) +PG_PROCTYPE(B_STANDALONE_BACKEND, "standalone backend", NULL, false) +PG_PROCTYPE(B_STARTUP, "startup", StartupProcessMain, true) +PG_PROCTYPE(B_WAL_RECEIVER, "walreceiver", WalReceiverMain, true) +PG_PROCTYPE(B_WAL_SENDER, "walsender", NULL, true) +PG_PROCTYPE(B_WAL_SUMMARIZER, "walsummarizer", WalSummarizerMain, true) +PG_PROCTYPE(B_WAL_WRITER, "walwriter", WalWriterMain, true) -- 2.39.5 [text/x-patch] v3-0002-log_min_messages-per-backend-type.patch (24.7K, ../../[email protected]/3-v3-0002-log_min_messages-per-backend-type.patch) download | inline diff: From a36fb59413fc6cca46a87accebebd08e515429a8 Mon Sep 17 00:00:00 2001 From: Euler Taveira <[email protected]> Date: Mon, 11 Dec 2023 17:24:50 -0300 Subject: [PATCH v3 2/2] log_min_messages per backend type Change log_min_messages from a single element to a comma-separated list of elements. Each element is backendtype:loglevel. The backendtype are archiver, autovacuum (includes launcher and workers), backend, bgworker, bgwriter, checkpointer, ioworker, logger, slotsyncworker, walreceiver, walsender, walsummarizer and walwriter. A single log level should be part of this list that is applied as a final step to the backend types that are not informed. The old syntax (a single log level) is still accepted for backward compatibility. In this case, it means the informed log level is applied for the backend types that are not informed. The default log level is the same (WARNING) for all backend types. --- doc/src/sgml/config.sgml | 32 ++- src/backend/commands/extension.c | 2 +- src/backend/commands/variable.c | 196 ++++++++++++++++++ src/backend/postmaster/launch_backend.c | 2 +- src/backend/utils/error/elog.c | 2 +- src/backend/utils/init/miscinit.c | 2 +- src/backend/utils/misc/guc_tables.c | 48 +++-- src/backend/utils/misc/postgresql.conf.sample | 1 + src/include/postmaster/proctypelist.h | 38 ++-- src/include/utils/guc.h | 2 +- src/include/utils/guc_hooks.h | 2 + src/include/utils/guc_tables.h | 4 + src/test/regress/expected/guc.out | 51 +++++ src/test/regress/sql/guc.sql | 17 ++ 14 files changed, 353 insertions(+), 46 deletions(-) diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 20ccb2d6b54..7c4002f2266 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -7021,7 +7021,7 @@ local0.* /var/log/postgresql <variablelist> <varlistentry id="guc-log-min-messages" xreflabel="log_min_messages"> - <term><varname>log_min_messages</varname> (<type>enum</type>) + <term><varname>log_min_messages</varname> (<type>string</type>) <indexterm> <primary><varname>log_min_messages</varname> configuration parameter</primary> </indexterm> @@ -7030,14 +7030,28 @@ local0.* /var/log/postgresql <para> Controls which <link linkend="runtime-config-severity-levels">message levels</link> are written to the server log. - Valid values are <literal>DEBUG5</literal>, <literal>DEBUG4</literal>, - <literal>DEBUG3</literal>, <literal>DEBUG2</literal>, <literal>DEBUG1</literal>, - <literal>INFO</literal>, <literal>NOTICE</literal>, <literal>WARNING</literal>, - <literal>ERROR</literal>, <literal>LOG</literal>, <literal>FATAL</literal>, and - <literal>PANIC</literal>. Each level includes all the levels that - follow it. The later the level, the fewer messages are sent - to the log. The default is <literal>WARNING</literal>. Note that - <literal>LOG</literal> has a different rank here than in + Valid values are a comma-separated list of <literal>backendtype:level</literal> + and a single <literal>level</literal>. The list allows it to use + different levels per backend type. + Valid <literal>backendtype</literal> values are <literal>archiver</literal>, + <literal>autovacuum</literal>, <literal>backend</literal>, + <literal>bgworker</literal>, <literal>bgwriter</literal>, + <literal>checkpointer</literal>, <literal>ioworker</literal>, + <literal>logger</literal>, <literal>slotsyncworker</literal>, + <literal>startup</literal>, <literal>walreceiver</literal>, + <literal>walsender</literal>, <literal>walsummarizer</literal>, and + <literal>walwriter</literal>. + Valid <literal>LEVEL</literal> values are <literal>DEBUG5</literal>, + <literal>DEBUG4</literal>, <literal>DEBUG3</literal>, <literal>DEBUG2</literal>, + <literal>DEBUG1</literal>, <literal>INFO</literal>, <literal>NOTICE</literal>, + <literal>WARNING</literal>, <literal>ERROR</literal>, <literal>LOG</literal>, + <literal>FATAL</literal>, and <literal>PANIC</literal>. Each level includes + all the levels that follow it. The later the level, the fewer messages are sent + to the log. A single <literal>LEVEL</literal> is mandatory (order does + not matter) and it is assigned to the backend types that are not + specified in the list. The default is <literal>WARNING</literal> for + all backend types. + Note that <literal>LOG</literal> has a different rank here than in <xref linkend="guc-client-min-messages"/>. Only superusers and users with the appropriate <literal>SET</literal> privilege can change this setting. diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index e6f9ab6dfd6..b6055431d8f 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -1143,7 +1143,7 @@ execute_extension_script(Oid extensionOid, ExtensionControlFile *control, (void) set_config_option("client_min_messages", "warning", PGC_USERSET, PGC_S_SESSION, GUC_ACTION_SAVE, true, 0, false); - if (log_min_messages < WARNING) + if (log_min_messages[MyBackendType] < WARNING) (void) set_config_option_ext("log_min_messages", "warning", PGC_SUSET, PGC_S_SESSION, BOOTSTRAP_SUPERUSERID, diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 608f10d9412..5c769dd7bcc 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -35,6 +35,7 @@ #include "utils/datetime.h" #include "utils/fmgrprotos.h" #include "utils/guc_hooks.h" +#include "utils/guc_tables.h" #include "utils/snapmgr.h" #include "utils/syscache.h" #include "utils/timestamp.h" @@ -1257,3 +1258,198 @@ check_ssl(bool *newval, void **extra, GucSource source) #endif return true; } + +/* + * GUC check_hook for log_min_messages + * + * The parsing consists of a comma-separated list of BACKENDTYPENAME:LEVEL + * elements. BACKENDTYPENAME is log_min_messages_backend_types. LEVEL is + * server_message_level_options. A single LEVEL element should be part of this + * list and it is applied as a final step to the backend types that are not + * specified. For backward compatibility, the old syntax is still accepted and + * it means to apply this level for all backend types. + */ +bool +check_log_min_messages(char **newval, void **extra, GucSource source) +{ + char *rawstring; + List *elemlist; + ListCell *l; + int newlevels[BACKEND_NUM_TYPES]; + bool assigned[BACKEND_NUM_TYPES]; + int genericlevel = -1; /* -1 means not assigned */ + + /* Initialize the array. */ + memset(newlevels, WARNING, BACKEND_NUM_TYPES * sizeof(int)); + memset(assigned, false, BACKEND_NUM_TYPES * sizeof(bool)); + + /* Need a modifiable copy of string. */ + rawstring = pstrdup(*newval); + + /* Parse string into list of identifiers. */ + if (!SplitGUCList(rawstring, ',', &elemlist)) + { + /* syntax error in list */ + GUC_check_errdetail("List syntax is invalid."); + pfree(rawstring); + list_free(elemlist); + return false; + } + + /* Validate and assign log level and backend type. */ + foreach(l, elemlist) + { + char *tok = (char *) lfirst(l); + char *sep; + const struct config_enum_entry *entry; + + /* + * Check whether there is a backend type following the log level. If + * there is no separator, it means this log level should be applied + * for all backend types (backward compatibility). + */ + sep = strchr(tok, ':'); + if (sep == NULL) + { + bool found = false; + + /* Reject duplicates for generic log level. */ + if (genericlevel != -1) + { + GUC_check_errdetail("Generic log level was already assigned."); + pfree(rawstring); + list_free(elemlist); + return false; + } + + /* Is the log level valid? */ + for (entry = server_message_level_options; entry && entry->name; entry++) + { + if (pg_strcasecmp(entry->name, tok) == 0) + { + genericlevel = entry->val; + found = true; + break; + } + } + + if (!found) + { + GUC_check_errdetail("Unrecognized log level: \"%s\".", tok); + pfree(rawstring); + list_free(elemlist); + return false; + } + } + else + { + char *loglevel; + char *btype; + bool found = false; + + btype = palloc((sep - tok) + 1); + memcpy(btype, tok, sep - tok); + btype[sep - tok] = '\0'; + loglevel = pstrdup(sep + 1); + + /* Is the log level valid? */ + for (entry = server_message_level_options; entry && entry->name; entry++) + { + if (pg_strcasecmp(entry->name, loglevel) == 0) + { + found = true; + break; + } + } + + if (!found) + { + GUC_check_errdetail("Unrecognized log level: \"%s\".", loglevel); + pfree(rawstring); + list_free(elemlist); + return false; + } + + /* + * Is the backend type name valid? There might be multiple entries + * per backend type, don't bail out when find first occurrence. + */ + found = false; + for (int i = 0; i < BACKEND_NUM_TYPES; i++) + { + if (pg_strcasecmp(log_min_messages_backend_types[i], btype) == 0) + { + /* Reject duplicates for a backend type. */ + if (assigned[i]) + { + GUC_check_errdetail("Backend type \"%s\" was already assigned.", btype); + pfree(rawstring); + list_free(elemlist); + return false; + } + + newlevels[i] = entry->val; + assigned[i] = true; + found = true; + } + } + + if (!found) + { + GUC_check_errdetail("Unrecognized backend type: \"%s\".", btype); + pfree(rawstring); + list_free(elemlist); + return false; + } + } + } + + /* + * Generic log level must be specified. It is a good idea to specify a + * generic log level to make it clear that it is the fallback value. + * Although, we can document it, it might confuse users that used to + * specify a single log level in prior releases. + */ + if (genericlevel == -1) + { + GUC_check_errdetail("Generic log level was not defined."); + pfree(rawstring); + list_free(elemlist); + return false; + } + + /* + * Apply the generic log level (the one without a backend type) after all + * of the specific backend type have been assigned. Hence, it doesn't + * matter the order you specify the generic log level, the final result + * will be the same. + */ + for (int i = 0; i < BACKEND_NUM_TYPES; i++) + { + if (!assigned[i]) + newlevels[i] = genericlevel; + } + + pfree(rawstring); + list_free(elemlist); + + /* + * Pass back data for assign_log_min_messages to use. + */ + *extra = guc_malloc(LOG, BACKEND_NUM_TYPES * sizeof(int)); + if (!*extra) + return false; + memcpy(*extra, newlevels, BACKEND_NUM_TYPES * sizeof(int)); + + return true; +} + +/* + * GUC assign_hook for log_min_messages + */ +void +assign_log_min_messages(const char *newval, void *extra) +{ + for (int i = 0; i < BACKEND_NUM_TYPES; i++) + log_min_messages[i] = ((int *) extra)[i]; +} diff --git a/src/backend/postmaster/launch_backend.c b/src/backend/postmaster/launch_backend.c index 8b2f1a0cf41..08395dafe04 100644 --- a/src/backend/postmaster/launch_backend.c +++ b/src/backend/postmaster/launch_backend.c @@ -177,7 +177,7 @@ typedef struct } child_process_kind; static child_process_kind child_process_kinds[] = { -#define PG_PROCTYPE(bktype, description, main_func, shmem_attach) \ +#define PG_PROCTYPE(bktype, bkcategory, description, main_func, shmem_attach, log_min_messages) \ [bktype] = {description, main_func, shmem_attach}, #include "postmaster/proctypelist.h" #undef PG_PROCTYPE diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 47af743990f..77cafe6e7b5 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -235,7 +235,7 @@ is_log_level_output(int elevel, int log_min_level) static inline bool should_output_to_server(int elevel) { - return is_log_level_output(elevel, log_min_messages); + return is_log_level_output(elevel, log_min_messages[MyBackendType]); } /* diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index dec220a61f5..8a919148fd7 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -266,7 +266,7 @@ GetBackendTypeDesc(BackendType backendType) switch (backendType) { -#define PG_PROCTYPE(bktype, description, main_func, shmem_attach) \ +#define PG_PROCTYPE(bktype, bkcategory, description, main_func, shmem_attach, log_min_messages) \ case bktype: backendDesc = gettext_noop(description); break; #include "postmaster/proctypelist.h" #undef PG_PROCTYPE diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index d14b1678e7f..300e172aa82 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -146,7 +146,7 @@ static const struct config_enum_entry client_message_level_options[] = { {NULL, 0, false} }; -static const struct config_enum_entry server_message_level_options[] = { +const struct config_enum_entry server_message_level_options[] = { {"debug5", DEBUG5, false}, {"debug4", DEBUG4, false}, {"debug3", DEBUG3, false}, @@ -536,7 +536,6 @@ static bool default_with_oids = false; bool current_role_is_superuser; int log_min_error_statement = ERROR; -int log_min_messages = WARNING; int client_min_messages = NOTICE; int log_min_duration_sample = -1; int log_min_duration_statement = -1; @@ -594,6 +593,7 @@ static char *server_version_string; static int server_version_num; static char *debug_io_direct_string; static char *restrict_nonsystem_relation_kind_string; +static char *log_min_messages_string; #ifdef HAVE_SYSLOG #define DEFAULT_SYSLOG_FACILITY LOG_LOCAL0 @@ -638,6 +638,27 @@ char *role_string; /* should be static, but guc.c needs to get at this */ bool in_hot_standby_guc; +/* + * It should be static, but commands/variable.c needs to get at this. + */ +int log_min_messages[] = { +#define PG_PROCTYPE(bktype, bkcategory, description, main_func, shmem_attach, log_min_messages) \ + [bktype] = log_min_messages, +#include "postmaster/proctypelist.h" +#undef PG_PROCTYPE +}; + +/* + * It might be in commands/variable.c but for convenience it is near + * log_min_messages. + */ +const char *const log_min_messages_backend_types[] = { +#define PG_PROCTYPE(bktype, bkcategory, description, main_func, shmem_attach, log_min_messages) \ + [bktype] = bkcategory, +#include "postmaster/proctypelist.h" +#undef PG_PROCTYPE +}; + /* * Displayable names for context types (enum GucContext) @@ -4298,6 +4319,18 @@ struct config_string ConfigureNamesString[] = check_client_encoding, assign_client_encoding, NULL }, + { + {"log_min_messages", PGC_SUSET, LOGGING_WHEN, + gettext_noop("Sets the message levels that are logged."), + gettext_noop("Each level includes all the levels that follow it. The later" + " the level, the fewer messages are sent."), + GUC_LIST_INPUT + }, + &log_min_messages_string, + "WARNING", + check_log_min_messages, assign_log_min_messages, NULL + }, + { {"log_line_prefix", PGC_SIGHUP, LOGGING_WHAT, gettext_noop("Controls information prefixed to each log line."), @@ -5110,17 +5143,6 @@ struct config_enum ConfigureNamesEnum[] = NULL, NULL, NULL }, - { - {"log_min_messages", PGC_SUSET, LOGGING_WHEN, - gettext_noop("Sets the message levels that are logged."), - gettext_noop("Each level includes all the levels that follow it. The later" - " the level, the fewer messages are sent.") - }, - &log_min_messages, - WARNING, server_message_level_options, - NULL, NULL, NULL - }, - { {"log_min_error_statement", PGC_SUSET, LOGGING_WHEN, gettext_noop("Causes all statements generating error at or above this level to be logged."), diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index a9d8293474a..c266effc597 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -539,6 +539,7 @@ # log # fatal # panic + # or a comma-separated list of backend_type:level #log_min_error_statement = error # values in order of decreasing detail: # debug5 diff --git a/src/include/postmaster/proctypelist.h b/src/include/postmaster/proctypelist.h index 919f00bb3a7..356cd45815a 100644 --- a/src/include/postmaster/proctypelist.h +++ b/src/include/postmaster/proctypelist.h @@ -29,22 +29,22 @@ * entries. */ -/* bktype, description, main_func, shmem_attach */ -PG_PROCTYPE(B_ARCHIVER, "archiver", PgArchiverMain, true) -PG_PROCTYPE(B_AUTOVAC_LAUNCHER, "autovacuum launcher", AutoVacLauncherMain, true) -PG_PROCTYPE(B_AUTOVAC_WORKER, "autovacuum worker", AutoVacWorkerMain, true) -PG_PROCTYPE(B_BACKEND, "client backend", BackendMain, true) -PG_PROCTYPE(B_BG_WORKER, "background worker", BackgroundWorkerMain, true) -PG_PROCTYPE(B_BG_WRITER, "background writer", BackgroundWriterMain, true) -PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", CheckpointerMain, true) -PG_PROCTYPE(B_DEAD_END_BACKEND, "dead-end client backend", BackendMain, true) -PG_PROCTYPE(B_INVALID, "unrecognized", NULL, false) -PG_PROCTYPE(B_IO_WORKER, "io worker", IoWorkerMain, true) -PG_PROCTYPE(B_LOGGER, "syslogger", SysLoggerMain, false) -PG_PROCTYPE(B_SLOTSYNC_WORKER, "slotsync worker", ReplSlotSyncWorkerMain, true) -PG_PROCTYPE(B_STANDALONE_BACKEND, "standalone backend", NULL, false) -PG_PROCTYPE(B_STARTUP, "startup", StartupProcessMain, true) -PG_PROCTYPE(B_WAL_RECEIVER, "walreceiver", WalReceiverMain, true) -PG_PROCTYPE(B_WAL_SENDER, "walsender", NULL, true) -PG_PROCTYPE(B_WAL_SUMMARIZER, "walsummarizer", WalSummarizerMain, true) -PG_PROCTYPE(B_WAL_WRITER, "walwriter", WalWriterMain, true) +/* bktype, bkcategory, description, main_func, shmem_attach, log_min_messages */ +PG_PROCTYPE(B_ARCHIVER, "archiver", "archiver", PgArchiverMain, true, WARNING) +PG_PROCTYPE(B_AUTOVAC_LAUNCHER, "autovacuum", "autovacuum launcher", AutoVacLauncherMain, true, WARNING) +PG_PROCTYPE(B_AUTOVAC_WORKER, "autovacuum", "autovacuum worker", AutoVacWorkerMain, true, WARNING) +PG_PROCTYPE(B_BACKEND, "backend", "client backend", BackendMain, true, WARNING) +PG_PROCTYPE(B_BG_WORKER, "bgworker", "background worker", BackgroundWorkerMain, true, WARNING) +PG_PROCTYPE(B_BG_WRITER, "bgwriter", "background writer", BackgroundWriterMain, true, WARNING) +PG_PROCTYPE(B_CHECKPOINTER, "checkpointer", "checkpointer", CheckpointerMain, true, WARNING) +PG_PROCTYPE(B_DEAD_END_BACKEND, "backend", "dead-end client backend", BackendMain, true, WARNING) +PG_PROCTYPE(B_INVALID, "backend", "invalid", NULL, false, WARNING) +PG_PROCTYPE(B_IO_WORKER, "ioworker", "io worker", IoWorkerMain, true, WARNING) +PG_PROCTYPE(B_LOGGER, "logger", "syslogger", SysLoggerMain, false, WARNING) +PG_PROCTYPE(B_SLOTSYNC_WORKER, "slotsyncworker", "slotsync worker", ReplSlotSyncWorkerMain, true, WARNING) +PG_PROCTYPE(B_STANDALONE_BACKEND, "backend", "standalone backend", NULL, false, WARNING) +PG_PROCTYPE(B_STARTUP, "startup", "startup", StartupProcessMain, true, WARNING) +PG_PROCTYPE(B_WAL_RECEIVER, "walreceiver", "walreceiver", WalReceiverMain, true, WARNING) +PG_PROCTYPE(B_WAL_SENDER, "walsender", "walsender", NULL, true, WARNING) +PG_PROCTYPE(B_WAL_SUMMARIZER, "walsummarizer", "walsummarizer", WalSummarizerMain, true, WARNING) +PG_PROCTYPE(B_WAL_WRITER, "walwriter", "walwriter", WalWriterMain, true, WARNING) diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index f619100467d..e10e24940a7 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -271,7 +271,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 int log_min_messages; +extern PGDLLIMPORT int log_min_messages[]; extern PGDLLIMPORT int client_min_messages; extern PGDLLIMPORT int log_min_duration_sample; extern PGDLLIMPORT int log_min_duration_statement; diff --git a/src/include/utils/guc_hooks.h b/src/include/utils/guc_hooks.h index 82ac8646a8d..e6ffc96468f 100644 --- a/src/include/utils/guc_hooks.h +++ b/src/include/utils/guc_hooks.h @@ -174,5 +174,7 @@ extern void assign_wal_sync_method(int new_wal_sync_method, void *extra); extern bool check_synchronized_standby_slots(char **newval, void **extra, GucSource source); extern void assign_synchronized_standby_slots(const char *newval, void *extra); +extern bool check_log_min_messages(char **newval, void **extra, GucSource source); +extern void assign_log_min_messages(const char *newval, void *extra); #endif /* GUC_HOOKS_H */ diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index f72ce944d7f..2aefc653f20 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -298,6 +298,10 @@ struct config_enum void *reset_extra; }; +/* log_min_messages */ +extern PGDLLIMPORT const char *const log_min_messages_backend_types[]; +extern PGDLLIMPORT const struct config_enum_entry server_message_level_options[]; + /* constant tables corresponding to enums above and in guc.h */ extern PGDLLIMPORT const char *const config_group_names[]; extern PGDLLIMPORT const char *const config_type_names[]; diff --git a/src/test/regress/expected/guc.out b/src/test/regress/expected/guc.out index 7f9e29c765c..741ad6bf062 100644 --- a/src/test/regress/expected/guc.out +++ b/src/test/regress/expected/guc.out @@ -913,3 +913,54 @@ SELECT name FROM tab_settings_flags (0 rows) DROP TABLE tab_settings_flags; +-- Test log_min_messages +SET log_min_messages TO fatal; +SHOW log_min_messages; + log_min_messages +------------------ + fatal +(1 row) + +SET log_min_messages TO 'fatal'; +SHOW log_min_messages; + log_min_messages +------------------ + fatal +(1 row) + +SET log_min_messages TO 'checkpointer:debug2, autovacuum:debug1'; --fail +ERROR: invalid value for parameter "log_min_messages": "checkpointer:debug2, autovacuum:debug1" +DETAIL: Generic log level was not defined. +SET log_min_messages TO 'debug1, backend:error, fatal'; -- fail +ERROR: invalid value for parameter "log_min_messages": "debug1, backend:error, fatal" +DETAIL: Generic log level was already assigned. +SET log_min_messages TO 'backend:error, debug1, backend:warning'; -- fail +ERROR: invalid value for parameter "log_min_messages": "backend:error, debug1, backend:warning" +DETAIL: Backend type "backend" was already assigned. +SET log_min_messages TO 'backend:error, foo:fatal, archiver:debug1'; -- fail +ERROR: invalid value for parameter "log_min_messages": "backend:error, foo:fatal, archiver:debug1" +DETAIL: Unrecognized backend type: "foo". +SET log_min_messages TO 'backend:error, checkpointer:bar, archiver:debug1'; -- fail +ERROR: invalid value for parameter "log_min_messages": "backend:error, checkpointer:bar, archiver:debug1" +DETAIL: Unrecognized log level: "bar". +SET log_min_messages TO 'backend:error, checkpointer:debug3, fatal, archiver:debug2, autovacuum:debug1, walsender:debug3'; +SHOW log_min_messages; + log_min_messages +------------------------------------------------------------------------------------------------- + backend:error, checkpointer:debug3, fatal, archiver:debug2, autovacuum:debug1, walsender:debug3 +(1 row) + +SET log_min_messages TO 'warning, autovacuum:debug1'; +SHOW log_min_messages; + log_min_messages +---------------------------- + warning, autovacuum:debug1 +(1 row) + +SET log_min_messages TO 'autovacuum:debug1, warning'; +SHOW log_min_messages; + log_min_messages +---------------------------- + autovacuum:debug1, warning +(1 row) + diff --git a/src/test/regress/sql/guc.sql b/src/test/regress/sql/guc.sql index f65f84a2632..12fa1812f35 100644 --- a/src/test/regress/sql/guc.sql +++ b/src/test/regress/sql/guc.sql @@ -368,3 +368,20 @@ SELECT name FROM tab_settings_flags WHERE no_reset AND NOT no_reset_all ORDER BY 1; DROP TABLE tab_settings_flags; + +-- Test log_min_messages +SET log_min_messages TO fatal; +SHOW log_min_messages; +SET log_min_messages TO 'fatal'; +SHOW log_min_messages; +SET log_min_messages TO 'checkpointer:debug2, autovacuum:debug1'; --fail +SET log_min_messages TO 'debug1, backend:error, fatal'; -- fail +SET log_min_messages TO 'backend:error, debug1, backend:warning'; -- fail +SET log_min_messages TO 'backend:error, foo:fatal, archiver:debug1'; -- fail +SET log_min_messages TO 'backend:error, checkpointer:bar, archiver:debug1'; -- fail +SET log_min_messages TO 'backend:error, checkpointer:debug3, fatal, archiver:debug2, autovacuum:debug1, walsender:debug3'; +SHOW log_min_messages; +SET log_min_messages TO 'warning, autovacuum:debug1'; +SHOW log_min_messages; +SET log_min_messages TO 'autovacuum:debug1, warning'; +SHOW log_min_messages; -- 2.39.5 ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-07-31 16:22 Japin Li <[email protected]> parent: Euler Taveira <[email protected]> 1 sibling, 1 reply; 13+ messages in thread From: Japin Li @ 2025-07-31 16:22 UTC (permalink / raw) To: Euler Taveira <[email protected]>; +Cc: Andres Freund <[email protected]>; Alvaro Herrera <[email protected]>; [email protected] On Thu, 31 Jul 2025 at 11:19, "Euler Taveira" <[email protected]> wrote: > On Thu, Mar 6, 2025, at 10:33 AM, Andres Freund wrote: >> Huh, the startup process is among the most crucial things to monitor? >> > > Good point. Fixed. > > After collecting some suggestions, I'm attaching a new patch contains the > following changes: > > - patch was rebased > - include Alvaro's patch (v2-0001) [1] as a basis for this patch > - add ioworker as new backend type > - add startup as new backend type per Andres suggestion > - small changes into documentation > >> I don't know what I think about the whole patch, but I do want to voice >> *strong* opposition to duplicating a list of all backend types into multiple >> places. It's already painfull enough to add a new backend type, without having >> to pointlessly go around and manually add a new backend type to mulltiple >> arrays that have completely predictable content. >> > > I'm including Alvaro's patch as is just to make the CF bot happy and to > illustrate how it would be if we adopt his solution to centralize the list of > backend types. I think Alvaro's proposal overcomes the objection [2], right? > If we set the log level for all backend types, I don't think a generic log level is necessary. -- Regards, Japin Li ChengDu WenWu Information Technology Co., Ltd. ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-07-31 16:51 Alvaro Herrera <[email protected]> parent: Japin Li <[email protected]> 0 siblings, 1 reply; 13+ messages in thread From: Alvaro Herrera @ 2025-07-31 16:51 UTC (permalink / raw) To: Japin Li <[email protected]>; +Cc: Euler Taveira <[email protected]>; Andres Freund <[email protected]>; [email protected] On 2025-Aug-01, Japin Li wrote: > If we set the log level for all backend types, I don't think a generic log > level is necessary. I don't understand what you mean by this. Can you elaborate? -- Álvaro Herrera 48°01'N 7°57'E — https://www.EnterpriseDB.com/ "If it is not right, do not do it. If it is not true, do not say it." (Marcus Aurelius, Meditations) ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-07-31 23:34 Japin Li <[email protected]> parent: Alvaro Herrera <[email protected]> 0 siblings, 0 replies; 13+ messages in thread From: Japin Li @ 2025-07-31 23:34 UTC (permalink / raw) To: Alvaro Herrera <[email protected]>; +Cc: Euler Taveira <[email protected]>; Andres Freund <[email protected]>; [email protected] On Thu, 31 Jul 2025 at 18:51, Alvaro Herrera <[email protected]> wrote: > On 2025-Aug-01, Japin Li wrote: > >> If we set the log level for all backend types, I don't think a generic log >> level is necessary. > > I don't understand what you mean by this. Can you elaborate? > For example: ALTER SYSTEM SET log_min_messages TO 'archiver:info, autovacuum:info, backend:info, bgworker:info, bgwriter:info, checkpointer:info, ioworker:info, logger:info, slotsyncworker:info, startup:info, walreceiver:info, walsender:info, walsummarizer:info, walwriter:info'; Given that we've set a log level for every backend type and assigned[BACKEND_NUM_TYPES] is true, a generic level seems redundant. -- Regards, Japin Li ChengDu WenWu Information Technology Co., Ltd. ^ permalink raw reply [nested|flat] 13+ messages in thread
* Re: log_min_messages per backend type @ 2025-08-01 05:53 Japin Li <[email protected]> parent: Euler Taveira <[email protected]> 1 sibling, 0 replies; 13+ messages in thread From: Japin Li @ 2025-08-01 05:53 UTC (permalink / raw) To: Euler Taveira <[email protected]>; +Cc: Andres Freund <[email protected]>; Alvaro Herrera <[email protected]>; [email protected] On Thu, Jul 31, 2025 at 11:19:48AM -0300, Euler Taveira wrote: > On Thu, Mar 6, 2025, at 10:33 AM, Andres Freund wrote: > > Huh, the startup process is among the most crucial things to monitor? > > > > Good point. Fixed. > > After collecting some suggestions, I'm attaching a new patch contains the > following changes: > > - patch was rebased > - include Alvaro's patch (v2-0001) [1] as a basis for this patch > - add ioworker as new backend type > - add startup as new backend type per Andres suggestion > - small changes into documentation > > > I don't know what I think about the whole patch, but I do want to voice > > *strong* opposition to duplicating a list of all backend types into multiple > > places. It's already painfull enough to add a new backend type, without having > > to pointlessly go around and manually add a new backend type to mulltiple > > arrays that have completely predictable content. > > > > I'm including Alvaro's patch as is just to make the CF bot happy and to > illustrate how it would be if we adopt his solution to centralize the list of > backend types. I think Alvaro's proposal overcomes the objection [2], right? > I think we can avoid memory allocation by using pg_strncasecmp(). diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c index 5c769dd7bcc..f854b2fac93 100644 --- a/src/backend/commands/variable.c +++ b/src/backend/commands/variable.c @@ -1343,14 +1343,10 @@ check_log_min_messages(char **newval, void **extra, GucSource source) } else { - char *loglevel; - char *btype; - bool found = false; - btype = palloc((sep - tok) + 1); - memcpy(btype, tok, sep - tok); - btype[sep - tok] = '\0'; - loglevel = pstrdup(sep + 1); + char *btype = tok; + char *loglevel = sep + 1; + bool found = false; /* Is the log level valid? */ for (entry = server_message_level_options; entry && entry->name; entry++) @@ -1377,7 +1373,7 @@ check_log_min_messages(char **newval, void **extra, GucSource source) found = false; for (int i = 0; i < BACKEND_NUM_TYPES; i++) { - if (pg_strcasecmp(log_min_messages_backend_types[i], btype) == 0) + if (pg_strncasecmp(log_min_messages_backend_types[i], btype, sep - tok) == 0) { /* Reject duplicates for a backend type. */ if (assigned[i]) -- Best regards, Japin Li ChengDu WenWu Information Technology Co., LTD. ^ permalink raw reply [nested|flat] 13+ messages in thread
end of thread, other threads:[~2025-08-01 05:53 UTC | newest] Thread overview: 13+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2021-03-07 00:35 [PATCH v7 1/2] Move pg_upgrade kludges to sql script Justin Pryzby <[email protected]> 2025-02-05 18:51 Re: log_min_messages per backend type Álvaro Herrera <[email protected]> 2025-03-05 00:33 ` Re: log_min_messages per backend type Euler Taveira <[email protected]> 2025-03-05 16:40 ` Re: log_min_messages per backend type Andrew Dunstan <[email protected]> 2025-03-06 13:20 ` Re: log_min_messages per backend type Matheus Alcantara <[email protected]> 2025-03-06 21:33 ` Re: log_min_messages per backend type Euler Taveira <[email protected]> 2025-03-06 02:53 ` Re: log_min_messages per backend type Fujii Masao <[email protected]> 2025-03-06 13:33 ` Re: log_min_messages per backend type Andres Freund <[email protected]> 2025-07-31 14:19 ` Re: log_min_messages per backend type Euler Taveira <[email protected]> 2025-07-31 16:22 ` Re: log_min_messages per backend type Japin Li <[email protected]> 2025-07-31 16:51 ` Re: log_min_messages per backend type Alvaro Herrera <[email protected]> 2025-07-31 23:34 ` Re: log_min_messages per backend type Japin Li <[email protected]> 2025-08-01 05:53 ` Re: log_min_messages per backend type Japin Li <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox