From da30175c5c40925f229fd058052709f0b07afc47 Mon Sep 17 00:00:00 2001 From: Hari Babu Date: Mon, 15 Jan 2018 15:28:57 +1100 Subject: [PATCH 2/2] pg_stat_wal_receiver to display connected host With the support of multi host connection string support in PostgreSQL, it is possible for the user to specify the multi host connection string in recovery.conf to avoid breakdown of streaming replication. The pg_stat_wal_receiver view is enhanced to support display of remote host information from which the replication is streaming currently with three additional columns remote_hostname, remote_hostaddr and remote_port. --- doc/src/sgml/monitoring.sgml | 24 ++++++++++++ src/backend/catalog/system_views.sql | 3 ++ .../libpqwalreceiver/libpqwalreceiver.c | 27 ++++++++++++++ src/backend/replication/walreceiver.c | 43 +++++++++++++++++++++- src/include/catalog/pg_proc.h | 2 +- src/include/replication/walreceiver.h | 10 +++++ src/test/regress/expected/rules.out | 5 ++- 7 files changed, 110 insertions(+), 4 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 8a9793644f..d8fe7c446b 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -2022,6 +2022,30 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i text Replication slot name used by this WAL receiver + + remote_hostname + text + + Host name of the PostgreSQL instance + this WAL receiver is connected to. + + + + remote_hostaddr + text + + Host address of the PostgreSQL instance + this WAL receiver is connected to. + + + + remote_port + integer + + Port number of the PostgreSQL instance + this WAL receiver is connected to. + + conninfo text diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 5652e9ee6d..57d1f90e21 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -750,6 +750,9 @@ CREATE VIEW pg_stat_wal_receiver AS s.latest_end_lsn, s.latest_end_time, s.slot_name, + s.remote_hostname, + s.remote_hostaddr, + s.remote_port, s.conninfo FROM pg_stat_get_wal_receiver() s WHERE s.pid IS NOT NULL; diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c index f9aec0531a..a01e84dece 100644 --- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c +++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c @@ -53,6 +53,8 @@ static WalReceiverConn *libpqrcv_connect(const char *conninfo, char **err); static void libpqrcv_check_conninfo(const char *conninfo); static char *libpqrcv_get_conninfo(WalReceiverConn *conn); +static void libpqrcv_get_remoteserver_info(WalReceiverConn *conn, char **host, + char **hostaddr, int *port); static char *libpqrcv_identify_system(WalReceiverConn *conn, TimeLineID *primary_tli, int *server_version); @@ -82,6 +84,7 @@ static WalReceiverFunctionsType PQWalReceiverFunctions = { libpqrcv_connect, libpqrcv_check_conninfo, libpqrcv_get_conninfo, + libpqrcv_get_remoteserver_info, libpqrcv_identify_system, libpqrcv_readtimelinehistoryfile, libpqrcv_startstreaming, @@ -282,6 +285,30 @@ libpqrcv_get_conninfo(WalReceiverConn *conn) return retval; } +/* + * Provides effective connected remote sever connection details. + */ +static void +libpqrcv_get_remoteserver_info(WalReceiverConn *conn, char **host, + char **hostaddr, int *port) +{ + char *ret = NULL; + + Assert(conn->streamConn != NULL); + + ret = PQhostNoDefault(conn->streamConn); + if (ret) + *host = pstrdup(ret); + + ret = PQhostaddr(conn->streamConn); + if (ret) + *hostaddr = pstrdup(ret); + + ret = PQport(conn->streamConn); + if (ret) + *port = atoi(ret); +} + /* * Check that primary's system identifier matches ours, and fetch the current * timeline ID of the primary. diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index a39a98ff18..a5079fc6bf 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -52,6 +52,7 @@ #include "access/xlog_internal.h" #include "catalog/pg_authid.h" #include "catalog/pg_type.h" +#include "common/ip.h" #include "funcapi.h" #include "libpq/pqformat.h" #include "libpq/pqsignal.h" @@ -199,6 +200,9 @@ WalReceiverMain(void) TimestampTz now; bool ping_sent; char *err; + char *host = NULL; + char *hostaddr = NULL; + int port = 0; /* * WalRcv should be set up already (if we are a backend, we inherit this @@ -311,16 +315,33 @@ WalReceiverMain(void) * conninfo, for security. */ tmp_conninfo = walrcv_get_conninfo(wrconn); + walrcv_get_remoteserver_info(wrconn, &host, &hostaddr, &port); SpinLockAcquire(&walrcv->mutex); memset(walrcv->conninfo, 0, MAXCONNINFO); if (tmp_conninfo) strlcpy((char *) walrcv->conninfo, tmp_conninfo, MAXCONNINFO); + + memset(walrcv->host, 0, NI_MAXHOST); + if (host) + strlcpy((char *) walrcv->host, host, NI_MAXHOST); + + memset(walrcv->hostaddr, 0, NI_MAXHOST); + if (hostaddr) + strlcpy((char *) walrcv->hostaddr, hostaddr, NI_MAXHOST); + + walrcv->port = port; walrcv->ready_to_display = true; SpinLockRelease(&walrcv->mutex); if (tmp_conninfo) pfree(tmp_conninfo); + if (host) + pfree(host); + + if (hostaddr) + pfree(hostaddr); + first_stream = true; for (;;) { @@ -1402,6 +1423,9 @@ pg_stat_get_wal_receiver(PG_FUNCTION_ARGS) TimestampTz last_receipt_time; XLogRecPtr latest_end_lsn; TimestampTz latest_end_time; + char host[NI_MAXHOST]; + char hostaddr[NI_MAXHOST]; + int port = 0; char slotname[NAMEDATALEN]; char conninfo[MAXCONNINFO]; @@ -1419,6 +1443,9 @@ pg_stat_get_wal_receiver(PG_FUNCTION_ARGS) latest_end_lsn = WalRcv->latestWalEnd; latest_end_time = WalRcv->latestWalEndTime; strlcpy(slotname, (char *) WalRcv->slotname, sizeof(slotname)); + strlcpy(host, (char *) WalRcv->host, sizeof(host)); + strlcpy(hostaddr, (char *) WalRcv->hostaddr, sizeof(hostaddr)); + port = WalRcv->port; strlcpy(conninfo, (char *) WalRcv->conninfo, sizeof(conninfo)); SpinLockRelease(&WalRcv->mutex); @@ -1482,10 +1509,22 @@ pg_stat_get_wal_receiver(PG_FUNCTION_ARGS) nulls[10] = true; else values[10] = CStringGetTextDatum(slotname); - if (*conninfo == '\0') + if (*host == '\0') nulls[11] = true; else - values[11] = CStringGetTextDatum(conninfo); + values[11] = CStringGetTextDatum(host); + if (*hostaddr == '\0') + nulls[12] = true; + else + values[12] = CStringGetTextDatum(hostaddr); + if (port == 0) + nulls[13] = true; + else + values[13] = Int32GetDatum(port); + if (*conninfo == '\0') + nulls[14] = true; + else + values[14] = CStringGetTextDatum(conninfo); } /* Returns the record as Datum */ diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index f01648c961..b6c2e474ad 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -2883,7 +2883,7 @@ DATA(insert OID = 3318 ( pg_stat_get_progress_info PGNSP PGUID 12 1 100 0 0 DESCR("statistics: information about progress of backends running maintenance command"); DATA(insert OID = 3099 ( pg_stat_get_wal_senders PGNSP PGUID 12 1 10 0 0 f f f f f t s r 0 0 2249 "" "{23,25,3220,3220,3220,3220,1186,1186,1186,23,25}" "{o,o,o,o,o,o,o,o,o,o,o}" "{pid,state,sent_lsn,write_lsn,flush_lsn,replay_lsn,write_lag,flush_lag,replay_lag,sync_priority,sync_state}" _null_ _null_ pg_stat_get_wal_senders _null_ _null_ _null_ )); DESCR("statistics: information about currently active replication"); -DATA(insert OID = 3317 ( pg_stat_get_wal_receiver PGNSP PGUID 12 1 0 0 0 f f f f f f s r 0 0 2249 "" "{23,25,3220,23,3220,23,1184,1184,3220,1184,25,25}" "{o,o,o,o,o,o,o,o,o,o,o,o}" "{pid,status,receive_start_lsn,receive_start_tli,received_lsn,received_tli,last_msg_send_time,last_msg_receipt_time,latest_end_lsn,latest_end_time,slot_name,conninfo}" _null_ _null_ pg_stat_get_wal_receiver _null_ _null_ _null_ )); +DATA(insert OID = 3317 ( pg_stat_get_wal_receiver PGNSP PGUID 12 1 0 0 0 f f f f f f s r 0 0 2249 "" "{23,25,3220,23,3220,23,1184,1184,3220,1184,25,25,25,23,25}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{pid,status,receive_start_lsn,receive_start_tli,received_lsn,received_tli,last_msg_send_time,last_msg_receipt_time,latest_end_lsn,latest_end_time,slot_name,remote_hostname,remote_hostaddr,remote_port,conninfo}" _null_ _null_ pg_stat_get_wal_receiver _null_ _null_ _null_ )); DESCR("statistics: information about WAL receiver"); DATA(insert OID = 6118 ( pg_stat_get_subscription PGNSP PGUID 12 1 0 0 0 f f f f f f s r 1 0 2249 "26" "{26,26,26,23,3220,1184,1184,3220,1184}" "{i,o,o,o,o,o,o,o,o}" "{subid,subid,relid,pid,received_lsn,last_msg_send_time,last_msg_receipt_time,latest_end_lsn,latest_end_time}" _null_ _null_ pg_stat_get_subscription _null_ _null_ _null_ )); DESCR("statistics: information about subscription"); diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h index ea7967f6fc..35783be820 100644 --- a/src/include/replication/walreceiver.h +++ b/src/include/replication/walreceiver.h @@ -107,6 +107,9 @@ typedef struct * clobbered to hide security-sensitive fields. */ char conninfo[MAXCONNINFO]; + char host[NI_MAXHOST]; + char hostaddr[NI_MAXHOST]; + int port; /* * replication slot name; is also used for walreceiver to connect with the @@ -197,6 +200,10 @@ typedef WalReceiverConn *(*walrcv_connect_fn) (const char *conninfo, bool logica char **err); typedef void (*walrcv_check_conninfo_fn) (const char *conninfo); typedef char *(*walrcv_get_conninfo_fn) (WalReceiverConn *conn); +typedef void (*walrcv_get_remoteserver_info_fn) (WalReceiverConn *conn, + char **host, + char **hostaddr, + int *port); typedef char *(*walrcv_identify_system_fn) (WalReceiverConn *conn, TimeLineID *primary_tli, int *server_version); @@ -227,6 +234,7 @@ typedef struct WalReceiverFunctionsType walrcv_connect_fn walrcv_connect; walrcv_check_conninfo_fn walrcv_check_conninfo; walrcv_get_conninfo_fn walrcv_get_conninfo; + walrcv_get_remoteserver_info_fn walrcv_get_remoteserver_info; walrcv_identify_system_fn walrcv_identify_system; walrcv_readtimelinehistoryfile_fn walrcv_readtimelinehistoryfile; walrcv_startstreaming_fn walrcv_startstreaming; @@ -246,6 +254,8 @@ extern PGDLLIMPORT WalReceiverFunctionsType *WalReceiverFunctions; WalReceiverFunctions->walrcv_check_conninfo(conninfo) #define walrcv_get_conninfo(conn) \ WalReceiverFunctions->walrcv_get_conninfo(conn) +#define walrcv_get_remoteserver_info(conn, host, hostaddr, port) \ + WalReceiverFunctions->walrcv_get_remoteserver_info(conn, host, hostaddr, port) #define walrcv_identify_system(conn, primary_tli, server_version) \ WalReceiverFunctions->walrcv_identify_system(conn, primary_tli, server_version) #define walrcv_readtimelinehistoryfile(conn, tli, filename, content, size) \ diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out index 5433944c6a..2ddf8c7674 100644 --- a/src/test/regress/expected/rules.out +++ b/src/test/regress/expected/rules.out @@ -1970,8 +1970,11 @@ pg_stat_wal_receiver| SELECT s.pid, s.latest_end_lsn, s.latest_end_time, s.slot_name, + s.remote_hostname, + s.remote_hostaddr, + s.remote_port, s.conninfo - FROM pg_stat_get_wal_receiver() s(pid, status, receive_start_lsn, receive_start_tli, received_lsn, received_tli, last_msg_send_time, last_msg_receipt_time, latest_end_lsn, latest_end_time, slot_name, conninfo) + FROM pg_stat_get_wal_receiver() s(pid, status, receive_start_lsn, receive_start_tli, received_lsn, received_tli, last_msg_send_time, last_msg_receipt_time, latest_end_lsn, latest_end_time, slot_name, remote_hostname, remote_hostaddr, remote_port, conninfo) WHERE (s.pid IS NOT NULL); pg_stat_xact_all_tables| SELECT c.oid AS relid, n.nspname AS schemaname, -- 2.15.0.windows.1