From 84007043fc1b1be68dad5d0a78269347c12094b6 Mon Sep 17 00:00:00 2001 From: Fujii Masao Date: Wed, 24 Mar 2021 10:37:54 +0900 Subject: [PATCH] Rename wait event WalrcvExit to WalReceiverExit. Commit de829ddf23 added wait event WalrcvExit. But its name is not consistent with other wait events like WalReceiverMain or WalReceiverWaitStart, etc. So this commit renames WalrcvExit to WalReceiverExit. Author: Fujii Masao Reviewed-by: Thomas Munro Discussion: https://postgr.es/m/cced9995-8fa2-7b22-9d91-3f22a2b8c23c@oss.nttdata.com --- doc/src/sgml/monitoring.sgml | 4 ++-- src/backend/postmaster/pgstat.c | 4 ++-- src/backend/replication/walreceiverfuncs.c | 2 +- src/include/pgstat.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 19540206f9..43c07da20e 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -1763,8 +1763,8 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser replication. - WalrcvExit - Waiting for the walreceiver to exit. + WalReceiverExit + Waiting for the WAL receiver to exit. WalReceiverWaitStart diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index b7af7c2707..60f45ccc4e 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -4121,8 +4121,8 @@ pgstat_get_wait_ipc(WaitEventIPC w) case WAIT_EVENT_SYNC_REP: event_name = "SyncRep"; break; - case WAIT_EVENT_WALRCV_EXIT: - event_name = "WalrcvExit"; + case WAIT_EVENT_WAL_RECEIVER_EXIT: + event_name = "WalReceiverExit"; break; case WAIT_EVENT_WAL_RECEIVER_WAIT_START: event_name = "WalReceiverWaitStart"; diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c index fff6c54c45..6f0acbfdef 100644 --- a/src/backend/replication/walreceiverfuncs.c +++ b/src/backend/replication/walreceiverfuncs.c @@ -224,7 +224,7 @@ ShutdownWalRcv(void) ConditionVariablePrepareToSleep(&walrcv->walRcvStoppedCV); while (WalRcvRunning()) ConditionVariableSleep(&walrcv->walRcvStoppedCV, - WAIT_EVENT_WALRCV_EXIT); + WAIT_EVENT_WAL_RECEIVER_EXIT); ConditionVariableCancelSleep(); } diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 2c82313550..87672e6f30 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -1008,7 +1008,7 @@ typedef enum WAIT_EVENT_REPLICATION_SLOT_DROP, WAIT_EVENT_SAFE_SNAPSHOT, WAIT_EVENT_SYNC_REP, - WAIT_EVENT_WALRCV_EXIT, + WAIT_EVENT_WAL_RECEIVER_EXIT, WAIT_EVENT_WAL_RECEIVER_WAIT_START, WAIT_EVENT_XACT_GROUP_UPDATE } WaitEventIPC;