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

diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 19540206f97e0c3de1524478c87e20c3ee2c5ade..43c07da20ea9556e9c6e5580d1f98b93ebd731f5 100644 (file)
--- 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.</entry>
      </row>
      <row>
-      <entry><literal>WalrcvExit</literal></entry>
-      <entry>Waiting for the walreceiver to exit.</entry>
+      <entry><literal>WalReceiverExit</literal></entry>
+      <entry>Waiting for the WAL receiver to exit.</entry>
      </row>
      <row>
       <entry><literal>WalReceiverWaitStart</literal></entry>

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index b7af7c2707af73ac22932ee93e2919a38af1a18e..60f45ccc4ea0d30b0e50cf1b4bd9780475f5c45e 100644 (file)
--- 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 fff6c54c45d3f1507757f8408f33a5d310bd2772..6f0acbfdef471c7811d076444b011e4c199755f6 100644 (file)
--- 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 2c823135509b7630a8d36371b1f16f48b2d59936..87672e6f3025a56c5447bf1d693f6b7752f2c91b 100644 (file)
--- 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;