From 042412879e35791a65509f2786b4954a273466e5 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Mon, 22 Nov 2021 12:55:36 -0300 Subject: [PATCH] autovacuum: Improve wording in a couple places A few strings (one WARNING and some memory context names) in the autovacuum code were written in a world where "worker" had no other possible meaning than "autovacuum worker", but that's long time gone. Be more specific about it. Also, change the WARNING from elog() to ereport(), to add translability. Author: Bharath Rupireddy Reviewed-by: Nathan Bossart Reviewed-by: Justin Pryzby Reviewed-by: Kyotaro Horiguchi Reviewed-by: Dilip Kumar Reviewed-by: Masahiko Sawada Discussion: https://postgr.es/m/CALj2ACX2UHp76dqdoZq92a7v4APFuV5wJQ+AUrb+2HURrKN=NQ@mail.gmail.com --- src/backend/postmaster/autovacuum.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 96332320a7..a9223e7b10 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -754,7 +754,8 @@ AutoVacLauncherMain(int argc, char *argv[]) dlist_push_head(&AutoVacuumShmem->av_freeWorkers, &worker->wi_links); AutoVacuumShmem->av_startingWorker = NULL; - elog(WARNING, "worker took too long to start; canceled"); + ereport(WARNING, + errmsg("autovacuum worker took too long to start; canceled")); } } else @@ -966,10 +967,10 @@ rebuild_database_list(Oid newdb) autovac_refresh_stats(); newcxt = AllocSetContextCreate(AutovacMemCxt, - "AV dblist", + "Autovacuum database list", ALLOCSET_DEFAULT_SIZES); tmpcxt = AllocSetContextCreate(newcxt, - "tmp AV dblist", + "Autovacuum database list (tmp)", ALLOCSET_DEFAULT_SIZES); oldcxt = MemoryContextSwitchTo(tmpcxt); @@ -992,7 +993,7 @@ rebuild_database_list(Oid newdb) hctl.keysize = sizeof(Oid); hctl.entrysize = sizeof(avl_dbase); hctl.hcxt = tmpcxt; - dbhash = hash_create("db hash", 20, &hctl, /* magic number here FIXME */ + dbhash = hash_create("autovacuum db hash", 20, &hctl, /* magic number here FIXME */ HASH_ELEM | HASH_BLOBS | HASH_CONTEXT); /* start by inserting the new database */ @@ -1179,7 +1180,7 @@ do_start_worker(void) * allocated for the database list. */ tmpcxt = AllocSetContextCreate(CurrentMemoryContext, - "Start worker tmp cxt", + "Autovacuum start worker (tmp)", ALLOCSET_DEFAULT_SIZES); oldcxt = MemoryContextSwitchTo(tmpcxt); @@ -1981,7 +1982,7 @@ do_autovacuum(void) * relations to vacuum/analyze across transactions. */ AutovacMemCxt = AllocSetContextCreate(TopMemoryContext, - "AV worker", + "Autovacuum worker", ALLOCSET_DEFAULT_SIZES); MemoryContextSwitchTo(AutovacMemCxt);