説明

From b283d3c708e26d5abf53c7f208de30f68c86d8da Mon Sep 17 00:00:00 2001 From: Tatsuo Ishii Date: Sun, 9 Mar 2025 13:52:04 +0900 Subject: [PATCH v1] Add client address, port and statement to pcp_proc_info. Moreover this commit adds followings: - Add the fields to show pool_pools command. - Add new pgpool_adm pcp_proc_info function along with the documentation. - Bump libpcp version from 2.0.0 to 3.0.0. --- doc.ja/src/sgml/ref/allfiles.sgml | 1 + .../sgml/ref/pgpool_adm_pcp_proc_info.sgml | 234 +++++++++++++++++ doc.ja/src/sgml/reference.sgml | 1 + doc/src/sgml/ref/allfiles.sgml | 1 + .../sgml/ref/pgpool_adm_pcp_proc_info.sgml | 248 ++++++++++++++++++ doc/src/sgml/reference.sgml | 1 + src/Makefile.am | 2 + src/include/pcp/libpcp_ext.h | 17 +- src/include/protocol/pool_proto_modules.h | 6 +- src/libs/pcp/Makefile.am | 2 +- src/pcp_con/pcp_worker.c | 2 +- src/protocol/child.c | 9 +- src/protocol/pool_proto_modules.c | 57 +++- src/sql/pgpool_adm/Makefile | 3 +- src/sql/pgpool_adm/pgpool_adm--1.5--1.6.sql | 61 +++++ src/sql/pgpool_adm/pgpool_adm--1.6.sql | 158 +++++++++++ src/sql/pgpool_adm/pgpool_adm.c | 176 +++++++++++++ src/sql/pgpool_adm/pgpool_adm.control | 2 +- src/sql/pgpool_adm/pgpool_adm.h | 5 +- .../regression/tests/038.pcp_commands/test.sh | 29 +- src/tools/pcp/pcp_frontend_client.c | 14 +- src/utils/pool_health_check_stats.c | 7 +- src/utils/pool_process_reporting.c | 18 +- 23 files changed, 1035 insertions(+), 19 deletions(-) create mode 100644 doc.ja/src/sgml/ref/pgpool_adm_pcp_proc_info.sgml create mode 100644 doc/src/sgml/ref/pgpool_adm_pcp_proc_info.sgml create mode 100644 src/sql/pgpool_adm/pgpool_adm--1.5--1.6.sql create mode 100644 src/sql/pgpool_adm/pgpool_adm--1.6.sql diff --git a/doc.ja/src/sgml/ref/allfiles.sgml b/doc.ja/src/sgml/ref/allfiles.sgml index 89be154bc..7127cb553 100644 --- a/doc.ja/src/sgml/ref/allfiles.sgml +++ b/doc.ja/src/sgml/ref/allfiles.sgml @@ -45,3 +45,4 @@ Complete list of usable sgml source files in this directory. + diff --git a/doc.ja/src/sgml/ref/pgpool_adm_pcp_proc_info.sgml b/doc.ja/src/sgml/ref/pgpool_adm_pcp_proc_info.sgml new file mode 100644 index 000000000..bc00b57ba --- /dev/null +++ b/doc.ja/src/sgml/ref/pgpool_adm_pcp_proc_info.sgml @@ -0,0 +1,234 @@ + + + + + pgpool_adm_pcp_proc_info + + + + pgpool_adm_pcp_proc_info + 3 + pgpool_adm extension + + + + pgpool_adm_pcp_proc_info + + Pgpool-IIの子プロセスの情報を表示する関数 + + + + + + + pcp_proc_info returns record + text host + integer port + text username + text password + out database text + out username text + out start_time text + out client_connection_count text + out major text + out minor text + out backend_connection_time text + out client_connection_time text + out client_idle_duration text + out client_disconnection_time text + out pool_counter text + out backend_pid text + out connected text + out pid text + out backend_id text + out status text + out load_balance_node text + out client_host text + out client_port text + out statement + + + + pcp_proc_info returns record + integer node_id + text pcp_server + out database text + out username text + out start_time text + out client_connection_count text + out major text + out minor text + out backend_connection_time text + out client_connection_time text + out client_idle_duration text + out client_disconnection_time text + out pool_counter text + out backend_pid text + out connected text + out pid text + out backend_id text + out status text + out load_balance_node text + out client_host text + out client_port text + out statement + + + + + + + 説明 + + pcp_proc_info + Pgpool-IIの子プロセスの情報を表示します。 + 表示される情報はと同じです。 + すべてのデータ型は"text"です。 + + + + + 引数 + + + + + pcp_server + + + pcpサーバの外部サーバ名 + + + + + + + + + を参照ください。 + + + + + + + + + 使用例 + + 以下の例では、検索条件で"connected"列 = '1'を指定して、現在クライアントから接続のあるプロセス情報のみを表示しています。 + このpsqlセッションでfrom pcp_proc_infoを呼び出していて、その情報は行1と2に表示されています。 + select文はbackend_id = '0'（おそらくprimaryです)にのみ送信されているので、行1の"status"列は"Execute command"となっており、"statement"列には実行したselect文が表示されていますが、backend_id = '1'にはselect文が送信されていないので、行2のstatementは空白となっています。 + + + 別psqlセッションの情報は行2, 3に表示されています。 + この例では"select 1"は"backend_id" = '1'（おそらくstandby)に送信されています。 + +test=# select * from pcp_proc_info(host => '', port => 11001, username => 't-ishii', password => 't-ishii') where connected = '1'; +-[ RECORD 1 ]-------------+---------------------------------------------------------------------------------------------------------------------------- +database | test +username | t-ishii +start_time | 2025-02-22 20:56:08 +client_connection_count | 0 +major | 3 +minor | 0 +backend_connection_time | 2025-02-22 20:58:37 +client_connection_time | 2025-02-22 20:58:37 +client_idle_duration | 0 +client_disconnection_time | +pool_counter | 1 +backend_pid | 14750 +connected | 1 +pid | 14585 +backend_id | 0 +status | Execute command +load_balance_node | 1 +client_host | 127.0.0.1 +client_port | 59120 +statement | select * from pcp_proc_info(host => '', port => 11001, username => 't-ishii', password => 't-ishii') where connected = '1'; +-[ RECORD 2 ]-------------+---------------------------------------------------------------------------------------------------------------------------- +database | test +username | t-ishii +start_time | 2025-02-22 20:56:08 +client_connection_count | 0 +major | 3 +minor | 0 +backend_connection_time | 2025-02-22 20:58:37 +client_connection_time | 2025-02-22 20:58:37 +client_idle_duration | 0 +client_disconnection_time | +pool_counter | 1 +backend_pid | 14751 +connected | 1 +pid | 14585 +backend_id | 1 +status | Execute command +load_balance_node | 0 +client_host | 127.0.0.1 +client_port | 59120 +statement | +-[ RECORD 3 ]-------------+---------------------------------------------------------------------------------------------------------------------------- +database | test +username | t-ishii +start_time | 2025-02-22 20:56:08 +client_connection_count | 0 +major | 3 +minor | 0 +backend_connection_time | 2025-02-22 20:58:56 +client_connection_time | 2025-02-22 20:58:56 +client_idle_duration | 0 +client_disconnection_time | +pool_counter | 1 +backend_pid | 14767 +connected | 1 +pid | 14601 +backend_id | 0 +status | Idle +load_balance_node | 0 +client_host | 127.0.0.1 +client_port | 54072 +statement | +-[ RECORD 4 ]-------------+---------------------------------------------------------------------------------------------------------------------------- +database | test +username | t-ishii +start_time | 2025-02-22 20:56:08 +client_connection_count | 0 +major | 3 +minor | 0 +backend_connection_time | 2025-02-22 20:58:56 +client_connection_time | 2025-02-22 20:58:56 +client_idle_duration | 0 +client_disconnection_time | +pool_counter | 1 +backend_pid | 14768 +connected | 1 +pid | 14601 +backend_id | 1 +status | Idle +load_balance_node | 1 +client_host | 127.0.0.1 +client_port | 54072 +statement | select 1; + + + + 次の例では、psqlをstandbyのPostgreSQLに接続し、pcp_proc_infoとpg_stat_activityを結合しています。 + これにより、Pgpool-IIを経由してPostgreSQLに接続しているクライアント(psql)のIPアドレスとポート番号、現在のPostgreSQLセッションの状態を表示しています。 + +test=# select p.client_host,p.client_port,g.state,g.query from pg_stat_activity as g, pcp_proc_info(host => '', port => 11001, username => 't-ishii', password => 't-ishii') as p where g.pid = p.backend_pid::int; + client_host | client_port | state | query +-------------+-------------+-------+----------- + 127.0.0.1 | 54072 | idle | select 1; +(1 row) + + + + 表示データの詳細に関してはをご覧ください。 + + + + + diff --git a/doc.ja/src/sgml/reference.sgml b/doc.ja/src/sgml/reference.sgml index adfe8e1e1..410556167 100644 --- a/doc.ja/src/sgml/reference.sgml +++ b/doc.ja/src/sgml/reference.sgml @@ -360,6 +360,7 @@ $ psql ... &pgpoolAdmPcpNodeCount &pgpoolAdmPcpAttachNode &pgpoolAdmPcpDetachNode + &pgpoolAdmPcpProcInfo diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index 89be154bc..7127cb553 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -45,3 +45,4 @@ Complete list of usable sgml source files in this directory. + diff --git a/doc/src/sgml/ref/pgpool_adm_pcp_proc_info.sgml b/doc/src/sgml/ref/pgpool_adm_pcp_proc_info.sgml new file mode 100644 index 000000000..0d8f2f53b --- /dev/null +++ b/doc/src/sgml/ref/pgpool_adm_pcp_proc_info.sgml @@ -0,0 +1,248 @@ + + + + + pgpool_adm_pcp_proc_info + + + + pgpool_adm_pcp_proc_info + 3 + pgpool_adm extension + + + + pgpool_adm_pcp_proc_info + + a function to display the information + on Pgpool-II child process + + + + + + + pcp_proc_info returns record + text host + integer port + text username + text password + out database text + out username text + out start_time text + out client_connection_count text + out major text + out minor text + out backend_connection_time text + out client_connection_time text + out client_idle_duration text + out client_disconnection_time text + out pool_counter text + out backend_pid text + out connected text + out pid text + out backend_id text + out status text + out load_balance_node text + out client_host text + out client_port text + out statement + + + + pcp_proc_info returns record + integer node_id + text pcp_server + out database text + out username text + out start_time text + out client_connection_count text + out major text + out minor text + out backend_connection_time text + out client_connection_time text + out client_idle_duration text + out client_disconnection_time text + out pool_counter text + out backend_pid text + out connected text + out pid text + out backend_id text + out status text + out load_balance_node text + out client_host text + out client_port text + out statement + + + + + + + Description + + pcp_proc_info + displays the information + on Pgpool-II child process. + All the information is same as . + All the data types are "text". + + + + + Arguments + + + + + pcp_server + + + The foreign server name for pcp server. + + + + + + + + + See . + + + + + + + + + Example + + In the example below a search condition "connected" column = '1' is + specified, and only the information on the process connected from + clients. In this psql session pcp_proc_info is called in the from + clause, and the information is shown on row 1 and 2. The select + statement is sent to only backend_id = '0' (which is probably the + primary), and the "status" column of the row 1 is "Execute + command", the "statement" column shows the select statement which + was executed. On the other hand the "statement" column of the row 2 + is empty, since the select statement is was not sent to backend_id + = '1'. + + + The information on the other psql session is shown on the row 2 and + 3. In this example "select 1" was sent to "backend_id" = '1' + (probably standby). + +test=# select * from pcp_proc_info(host => '', port => 11001, username => 't-ishii', password => 't-ishii') where connected = '1'; +-[ RECORD 1 ]-------------+---------------------------------------------------------------------------------------------------------------------------- +database | test +username | t-ishii +start_time | 2025-02-22 20:56:08 +client_connection_count | 0 +major | 3 +minor | 0 +backend_connection_time | 2025-02-22 20:58:37 +client_connection_time | 2025-02-22 20:58:37 +client_idle_duration | 0 +client_disconnection_time | +pool_counter | 1 +backend_pid | 14750 +connected | 1 +pid | 14585 +backend_id | 0 +status | Execute command +load_balance_node | 1 +client_host | 127.0.0.1 +client_port | 59120 +statement | select * from pcp_proc_info(host => '', port => 11001, username => 't-ishii', password => 't-ishii') where connected = '1'; +-[ RECORD 2 ]-------------+---------------------------------------------------------------------------------------------------------------------------- +database | test +username | t-ishii +start_time | 2025-02-22 20:56:08 +client_connection_count | 0 +major | 3 +minor | 0 +backend_connection_time | 2025-02-22 20:58:37 +client_connection_time | 2025-02-22 20:58:37 +client_idle_duration | 0 +client_disconnection_time | +pool_counter | 1 +backend_pid | 14751 +connected | 1 +pid | 14585 +backend_id | 1 +status | Execute command +load_balance_node | 0 +client_host | 127.0.0.1 +client_port | 59120 +statement | +-[ RECORD 3 ]-------------+---------------------------------------------------------------------------------------------------------------------------- +database | test +username | t-ishii +start_time | 2025-02-22 20:56:08 +client_connection_count | 0 +major | 3 +minor | 0 +backend_connection_time | 2025-02-22 20:58:56 +client_connection_time | 2025-02-22 20:58:56 +client_idle_duration | 0 +client_disconnection_time | +pool_counter | 1 +backend_pid | 14767 +connected | 1 +pid | 14601 +backend_id | 0 +status | Idle +load_balance_node | 0 +client_host | 127.0.0.1 +client_port | 54072 +statement | +-[ RECORD 4 ]-------------+---------------------------------------------------------------------------------------------------------------------------- +database | test +username | t-ishii +start_time | 2025-02-22 20:56:08 +client_connection_count | 0 +major | 3 +minor | 0 +backend_connection_time | 2025-02-22 20:58:56 +client_connection_time | 2025-02-22 20:58:56 +client_idle_duration | 0 +client_disconnection_time | +pool_counter | 1 +backend_pid | 14768 +connected | 1 +pid | 14601 +backend_id | 1 +status | Idle +load_balance_node | 1 +client_host | 127.0.0.1 +client_port | 54072 +statement | select 1; + + + + In the next example psql connects to the PostgreSQL standby, and + pcp_proc_info and pg_stat_activity are joined. By this, IP address + and the port number of the client which is connecting to PostgreSQL + via Pgpool-II are shown, and the PostgreSQL session state are + shown. + +test=# select p.client_host,p.client_port,g.state,g.query from pg_stat_activity as g, pcp_proc_info(host => '', port => 11001, username => 't-ishii', password => 't-ishii') as p where g.pid = p.backend_pid::int; + client_host | client_port | state | query +-------------+-------------+-------+----------- + 127.0.0.1 | 54072 | idle | select 1; +(1 row) + + + + See for more information on each + shown data. + + + + + diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index 2b2db4947..6d2ea97ce 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -254,6 +254,7 @@ &pgpoolAdmPcpNodeCount &pgpoolAdmPcpAttachNode &pgpoolAdmPcpDetachNode + &pgpoolAdmPcpProcInfo diff --git a/src/Makefile.am b/src/Makefile.am index e32c41269..b69b0a5b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -155,6 +155,8 @@ EXTRA_DIST = sample/pgpool.pam \ sql/pgpool_adm/pgpool_adm--1.3--1.4.sql \ sql/pgpool_adm/pgpool_adm--1.5.sql \ sql/pgpool_adm/pgpool_adm--1.4--1.5.sql \ + sql/pgpool_adm/pgpool_adm--1.6.sql \ + sql/pgpool_adm/pgpool_adm--1.5--1.6.sql \ sql/pgpool_adm/Makefile \ test/parser/expected/copy.out test/parser/expected/create.out \ test/parser/expected/cursor.out test/parser/expected/delete.out \ diff --git a/src/include/pcp/libpcp_ext.h b/src/include/pcp/libpcp_ext.h index 232dc8143..d79ddc156 100644 --- a/src/include/pcp/libpcp_ext.h +++ b/src/include/pcp/libpcp_ext.h @@ -4,7 +4,7 @@ * pgpool: a language independent connection pool server for PostgreSQL * written by Tatsuo Ishii * - * Copyright (c) 2003-2024 PgPool Global Development Group + * Copyright (c) 2003-2025 PgPool Global Development Group * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby @@ -26,6 +26,8 @@ #ifndef LIBPCP_EXT_H #define LIBPCP_EXT_H +#include + #include #include @@ -33,6 +35,9 @@ #include "parser/pg_config_manual.h" #endif +/* returns number of bits in the data type or variable */ +#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE) + /* * startup packet definitions (v2) stolen from PostgreSQL */ @@ -170,6 +175,9 @@ typedef struct * process information * This object put on shared memory. */ + +#define MAXSTMTLEN 1024 + typedef struct { pid_t pid; /* OS's process id */ @@ -180,6 +188,10 @@ typedef struct * this process */ int client_connection_count; /* how many times clients used this process */ ProcessStatus status; + char client_host[NI_MAXHOST]; /* client host. Only valid if status != WAIT_FOR_CONNECT */ + char client_port[NI_MAXSERV]; /* client port. Only valid if status != WAIT_FOR_CONNECT */ + char statement[MAXSTMTLEN]; /* the last statement sent to backend */ + uint64 node_ids[2]; /* "statement" is sent to the node id (bitmap) */ bool need_to_restart; /* If non 0, exit this child process as * soon as current session ends. Typical * case this flag being set is failback a @@ -266,6 +278,9 @@ typedef struct char pool_connected[POOLCONFIG_MAXCOUNTLEN + 1]; char status[POOLCONFIG_MAXPROCESSSTATUSLEN + 1]; char load_balance_node[POOLCONFIG_MAXPROCESSSTATUSLEN + 1]; + char client_host[NI_MAXHOST]; + char client_port[NI_MAXSERV]; + char statement[MAXSTMTLEN]; } POOL_REPORT_POOLS; /* version struct */ diff --git a/src/include/protocol/pool_proto_modules.h b/src/include/protocol/pool_proto_modules.h index fc2aa31d8..663dcc984 100644 --- a/src/include/protocol/pool_proto_modules.h +++ b/src/include/protocol/pool_proto_modules.h @@ -6,7 +6,7 @@ * pgpool: a language independent connection pool server for PostgreSQL * written by Tatsuo Ishii * - * Copyright (c) 2003-2024 PgPool Global Development Group + * Copyright (c) 2003-2025 PgPool Global Development Group * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby @@ -213,4 +213,8 @@ extern void NoticeResponse(POOL_CONNECTION * frontend, extern char per_node_error_log(POOL_CONNECTION_POOL * backend, int node_id, char *query, char *prefix, bool unread); +extern void init_pi_set(void); +extern void pi_set(int node_id); +extern bool is_pi_set(uint64 *node_ids, int node_id); + #endif diff --git a/src/libs/pcp/Makefile.am b/src/libs/pcp/Makefile.am index 9127c7827..306a144df 100644 --- a/src/libs/pcp/Makefile.am +++ b/src/libs/pcp/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -D_GNU_SOURCE -DPOOL_PRIVATE -I @PGSQL_INCLUDE_DIR@ lib_LTLIBRARIES = libpcp.la -libpcp_la_LDFLAGS = -version-info 2:0:0 +libpcp_la_LDFLAGS = -version-info 3:0:0 dist_libpcp_la_SOURCES = pcp.c \ ../../utils/pool_path.c \ ../../tools/fe_port.c \ diff --git a/src/pcp_con/pcp_worker.c b/src/pcp_con/pcp_worker.c index de2658d5e..da6caed4f 100644 --- a/src/pcp_con/pcp_worker.c +++ b/src/pcp_con/pcp_worker.c @@ -4,7 +4,7 @@ * pgpool: a language independent connection pool server for PostgreSQL * written by Tatsuo Ishii * - * Copyright (c) 2003-2024 PgPool Global Development Group + * Copyright (c) 2003-2025 PgPool Global Development Group * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby diff --git a/src/protocol/child.c b/src/protocol/child.c index 53a4cce68..76a818587 100644 --- a/src/protocol/child.c +++ b/src/protocol/child.c @@ -5,7 +5,7 @@ * pgpool: a language independent connection pool server for PostgreSQL * written by Tatsuo Ishii * - * Copyright (c) 2003-2024 PgPool Global Development Group + * Copyright (c) 2003-2025 PgPool Global Development Group * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby @@ -1909,11 +1909,18 @@ static POOL_CONNECTION * get_connection(int front_end_fd, SockAddr *saddr) { POOL_CONNECTION *cp; + ProcessInfo *pi; ereport(DEBUG1, (errmsg("I am %d accept fd %d", getpid(), front_end_fd))); pool_getnameinfo_all(saddr, remote_host, remote_port); + + /* save remote client host and port info onto shared memory */ + pi = pool_get_my_process_info(); + StrNCpy(pi->client_host, remote_host, NI_MAXHOST); + StrNCpy(pi->client_port, remote_port, NI_MAXSERV); + print_process_status(remote_host, remote_port); set_ps_display("accept connection", false); diff --git a/src/protocol/pool_proto_modules.c b/src/protocol/pool_proto_modules.c index 59647fe81..849f7980f 100644 --- a/src/protocol/pool_proto_modules.c +++ b/src/protocol/pool_proto_modules.c @@ -3,7 +3,7 @@ * pgpool: a language independent connection pool server for PostgreSQL * written by Tatsuo Ishii * - * Copyright (c) 2003-2024 PgPool Global Development Group + * Copyright (c) 2003-2025 PgPool Global Development Group * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby @@ -397,6 +397,11 @@ SimpleQuery(POOL_CONNECTION * frontend, */ pool_start_query(query_context, contents, len, node); + /* + * Initialize ProcessInfo->node_ids and ProcessInfo->statement. + */ + init_pi_set(); + /* * Check if the transaction is in abort status. If so, we do nothing * and just return an error message to frontend, execpt for @@ -758,6 +763,8 @@ SimpleQuery(POOL_CONNECTION * frontend, session_context->uncompleted_message = NULL; } + /* initialize backend send statement bitmap */ + init_pi_set(); if (!RAW_MODE) { @@ -1145,6 +1152,9 @@ Execute(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend, /* check if query is "COMMIT" or "ROLLBACK" */ commit = is_commit_or_rollback_query(node); + /* initialize backend send statement bitmap */ + init_pi_set(); + if (!SL_MODE) { /* @@ -3749,11 +3759,56 @@ generate_error_message(char *prefix, int specific_error, char *query) void per_node_statement_log(POOL_CONNECTION_POOL * backend, int node_id, char *query) { + ProcessInfo *pi = pool_get_my_process_info(); POOL_CONNECTION_POOL_SLOT *slot = backend->slots[node_id]; if (pool_config->log_per_node_statement) ereport(LOG, (errmsg("DB node id: %d backend pid: %d statement: %s", node_id, ntohl(slot->pid), query))); + + pi_set(node_id); + StrNCpy(pi->statement, query, MAXSTMTLEN); +} + +/* + * Initialize ProcessInfo->node_ids and ProcessInfo->statement. + */ +void +init_pi_set(void) +{ + ProcessInfo *pi = pool_get_my_process_info(); + + memset(pi->node_ids, 0, sizeof(pi->node_ids)); + pi->statement[0] = '\0'; +} + +/* + * Set ProcessInfo->node_ids. + */ +void +pi_set(int node_id) +{ + ProcessInfo *pi = pool_get_my_process_info(); + + if (node_id < BITS_PER_TYPE(uint64)) + pi->node_ids[0] |= (1 << node_id); + else + pi->node_ids[1] |= (1 << (node_id - BITS_PER_TYPE(uint64))); +} + +/* + * Returns true if node_id bit in ProcessInfo->node_ids is on. + */ +bool +is_pi_set(uint64 *node_ids, int node_id) +{ + int set; + + if (node_id < BITS_PER_TYPE(uint64)) + set = node_ids[0] & (1 << node_id); + else + set = node_ids[1] & (1 << (node_id - BITS_PER_TYPE(uint64))); + return set != 0; } /* diff --git a/src/sql/pgpool_adm/Makefile b/src/sql/pgpool_adm/Makefile index 199772207..6dde6ccf6 100644 --- a/src/sql/pgpool_adm/Makefile +++ b/src/sql/pgpool_adm/Makefile @@ -8,7 +8,8 @@ EXTENSION = pgpool_adm DATA = pgpool_adm--1.0.sql pgpool_adm--1.1.sql pgpool_adm--1.2.sql pgpool_adm--1.3.sql \ pgpool_adm--1.0--1.1.sql pgpool_adm--1.1--1.2.sql pgpool_adm--1.2--1.3.sql \ pgpool_adm--1.4.sql pgpool_adm--1.3--1.4.sql \ -pgpool_adm--1.5.sql pgpool_adm--1.4--1.5.sql +pgpool_adm--1.5.sql pgpool_adm--1.4--1.5.sql \ +pgpool_adm--1.6.sql pgpool_adm--1.5--1.6.sql SHLIB_LINK = -L../../libs/pcp/.libs -lpcp -Wl,--as-needed -Wl,-rpath,'${prefix}/lib',--enable-new-dtags # if you are using PostgreSQL 8.0 or later, # using pg_config is recommended. diff --git a/src/sql/pgpool_adm/pgpool_adm--1.5--1.6.sql b/src/sql/pgpool_adm/pgpool_adm--1.5--1.6.sql new file mode 100644 index 000000000..881cfb7c9 --- /dev/null +++ b/src/sql/pgpool_adm/pgpool_adm--1.5--1.6.sql @@ -0,0 +1,61 @@ +/* contrib/pgpool_adm/pgpool_adm--1.5--1.6.sql */ + +-- complain if script is sourced in psql, rather than via ALTER EXTENSION +\echo Use "ALTER EXTENSION pgpool_adm UPDATE TO '1.6'" to load this file. \quit + +/** + * input parameters: node_id, host, port, username, password + */ +CREATE FUNCTION pcp_proc_info(IN host text, IN port integer, IN username text, IN password text, +OUT database text, +OUT username text, +OUT start_time text, +OUT client_connection_count text, +OUT major text, +OUT minor text, +OUT backend_connection_time text, +OUT client_connection_time text, +OUT client_idle_duration text, +OUT client_disconnection_time text, +OUT pool_counter text, +OUT backend_pid text, +OUT connected text, +OUT pid text, +OUT backend_id text, +OUT status text, +OUT load_balance_node text, +OUT client_host text, +OUT client_port text, +OUT statement text) +RETURNS SETOF record +AS 'MODULE_PATHNAME', '_pcp_proc_info' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, pcp_server + */ +CREATE FUNCTION pcp_proc_info(IN pcp_server text, +OUT database text, +OUT username text, +OUT start_time text, +OUT client_connection_count text, +OUT major text, +OUT minor text, +OUT backend_connection_time text, +OUT client_connection_time text, +OUT client_idle_duration text, +OUT client_disconnection_time text, +OUT pool_counter text, +OUT backend_pid text, +OUT connected text, +OUT pid text, +OUT backend_id text, +OUT status text, +OUT load_balance_node text, +OUT client_host text, +OUT client_port text, +OUT statement text) +RETURNS SETOF record +AS 'MODULE_PATHNAME', '_pcp_proc_info' +LANGUAGE C VOLATILE STRICT; + diff --git a/src/sql/pgpool_adm/pgpool_adm--1.6.sql b/src/sql/pgpool_adm/pgpool_adm--1.6.sql new file mode 100644 index 000000000..4d5c26215 --- /dev/null +++ b/src/sql/pgpool_adm/pgpool_adm--1.6.sql @@ -0,0 +1,158 @@ +/* contrib/pgpool_adm/pgpool_adm--1.6.sql */ + +/* *********************************************** + * Administrative functions for pgPool + * *********************************************** */ + +/** + * input parameters: node_id, host, port, username, password + */ +CREATE FUNCTION pcp_node_info(IN node_id integer, IN host text, IN port integer, IN username text, IN password text, OUT host text, OUT port integer, OUT status text, OUT pg_status text, OUT weight float4, OUT role text, OUT pg_role text, OUT replication_delay bigint, OUT replication_state text, OUT replication_sync_state text, OUT last_status_change timestamp) +RETURNS record +AS 'MODULE_PATHNAME', '_pcp_node_info' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, pcp_server + */ +CREATE FUNCTION pcp_node_info(IN node_id integer, IN pcp_server text, OUT host text, OUT port integer, OUT status text, OUT weight float4) +RETURNS record +AS 'MODULE_PATHNAME', '_pcp_node_info' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, host, port, username, password + */ +CREATE FUNCTION pcp_health_check_stats(IN node_id integer, IN host text, IN port integer, IN username text, IN password text, OUT node_id integer, OUT host text, OUT port integer, OUT status text, OUT role text, OUT last_status_change timestamp, OUT total_count bigint, OUT success_count bigint, OUT fail_count bigint, OUT skip_count bigint, OUT retry_count bigint, OUT average_retry_count float4, OUT max_retry_count bigint, OUT max_health_check_duration bigint, OUT min_health_check_duration bigint, OUT average_health_check_duration float4, OUT last_health_check timestamp, OUT last_successful_health_check timestamp, OUT last_skip_health_check timestamp, OUT last_failed_health_check timestamp) +RETURNS record +AS 'MODULE_PATHNAME', '_pcp_health_check_stats' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, pcp_server + */ +CREATE FUNCTION pcp_health_check_stats(IN node_id integer, IN pcp_server text, OUT host text, OUT port integer, OUT status text, OUT weight float4) +RETURNS record +AS 'MODULE_PATHNAME', '_pcp_health_check_stats' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: host, port, username, password + */ +CREATE FUNCTION pcp_pool_status(IN host text, IN port integer, IN username text, IN password text, OUT item text, OUT value text, OUT description text) +RETURNS SETOF record +AS 'MODULE_PATHNAME', '_pcp_pool_status' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: pcp_server + */ +CREATE FUNCTION pcp_pool_status(IN pcp_server text, OUT item text, OUT value text, OUT description text) +RETURNS SETOF record +AS 'MODULE_PATHNAME', '_pcp_pool_status' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: host, port, username, password + */ +CREATE FUNCTION pcp_node_count(IN host text, IN port integer, IN username text, IN password text, OUT node_count integer) +RETURNS integer +AS 'MODULE_PATHNAME', '_pcp_node_count' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: pcp_server + */ +CREATE FUNCTION pcp_node_count(IN pcp_server text, OUT node_count integer) +RETURNS integer +AS 'MODULE_PATHNAME', '_pcp_node_count' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, host, port, username, password + */ +CREATE FUNCTION pcp_attach_node(IN node_id integer, IN host text, IN port integer, IN username text, IN password text, OUT node_attached boolean) +RETURNS boolean +AS 'MODULE_PATHNAME', '_pcp_attach_node' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, pcp_server + */ +CREATE FUNCTION pcp_attach_node(IN node_id integer, IN pcp_server text, OUT node_attached boolean) +RETURNS boolean +AS 'MODULE_PATHNAME', '_pcp_attach_node' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, gracefully, host, port, username, password + */ +CREATE FUNCTION pcp_detach_node(IN node_id integer, IN gracefully boolean, IN host text, IN port integer, IN username text, IN password text, OUT node_detached boolean) +RETURNS boolean +AS 'MODULE_PATHNAME', '_pcp_detach_node' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, gracefully, pcp_server + */ +CREATE FUNCTION pcp_detach_node(IN node_id integer, IN gracefully boolean, IN pcp_server text, OUT node_detached boolean) +RETURNS boolean +AS 'MODULE_PATHNAME', '_pcp_detach_node' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, host, port, username, password + */ +CREATE FUNCTION pcp_proc_info(IN host text, IN port integer, IN username text, IN password text, +OUT database text, +OUT username text, +OUT start_time text, +OUT client_connection_count text, +OUT major text, +OUT minor text, +OUT backend_connection_time text, +OUT client_connection_time text, +OUT client_idle_duration text, +OUT client_disconnection_time text, +OUT pool_counter text, +OUT backend_pid text, +OUT connected text, +OUT pid text, +OUT backend_id text, +OUT status text, +OUT load_balance_node text, +OUT client_host text, +OUT client_port text, +OUT statement text) +RETURNS SETOF record +AS 'MODULE_PATHNAME', '_pcp_proc_info' +LANGUAGE C VOLATILE STRICT; + +/** + * input parameters: node_id, pcp_server + */ +CREATE FUNCTION pcp_proc_info(IN pcp_server text, +OUT database text, +OUT username text, +OUT start_time text, +OUT client_connection_count text, +OUT major text, +OUT minor text, +OUT backend_connection_time text, +OUT client_connection_time text, +OUT client_idle_duration text, +OUT client_disconnection_time text, +OUT pool_counter text, +OUT backend_pid text, +OUT connected text, +OUT pid text, +OUT backend_id text, +OUT status text, +OUT load_balance_node text, +OUT client_host text, +OUT client_port text, +OUT statement text) +RETURNS SETOF record +AS 'MODULE_PATHNAME', '_pcp_proc_info' +LANGUAGE C VOLATILE STRICT; + diff --git a/src/sql/pgpool_adm/pgpool_adm.c b/src/sql/pgpool_adm/pgpool_adm.c index 9a8cb9648..b1e2f5822 100644 --- a/src/sql/pgpool_adm/pgpool_adm.c +++ b/src/sql/pgpool_adm/pgpool_adm.c @@ -751,3 +751,179 @@ Timestamp str2timestamp(char *str) Int32GetDatum(-1)))); } +/** + * host_or_srv: server name or ip address of the pgpool server + * port: pcp port number + * user: user to connect with + * pass: password + **/ +Datum +_pcp_proc_info(PG_FUNCTION_ARGS) +{ + MemoryContext oldcontext; + FuncCallContext *funcctx; + int32 nrows; + int32 call_cntr; + int32 max_calls; + AttInMetadata *attinmeta; + PCPConnInfo *pcpConnInfo; + PCPResultInfo *pcpResInfo; + + int an; + +#define NUM_COLS 20 /* number of columns */ + + /* stuff done only on the first call of the function */ + if (SRF_IS_FIRSTCALL()) + { + TupleDesc tupdesc; + char *host_or_srv = text_to_cstring(PG_GETARG_TEXT_PP(0)); + + /* create a function context for cross-call persistence */ + funcctx = SRF_FIRSTCALL_INIT(); + + /* switch to memory context appropriate for multiple function calls */ + oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); + + if (PG_NARGS() == 4) + { + char *user, + *pass; + int port; + + port = PG_GETARG_INT16(1); + user = text_to_cstring(PG_GETARG_TEXT_PP(2)); + pass = text_to_cstring(PG_GETARG_TEXT_PP(3)); + pcpConnInfo = connect_to_server(host_or_srv, port, user, pass); + } + else if (PG_NARGS() == 1) + pcpConnInfo = connect_to_server_from_foreign_server(host_or_srv); + else + { + MemoryContextSwitchTo(oldcontext); + ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), errmsg("Wrong number of argument."))); + } + + pcpResInfo = pcp_process_info(pcpConnInfo, 0); + if (pcpResInfo == NULL || PCPResultStatus(pcpResInfo) != PCP_RES_COMMAND_OK) + { + char *error = pcp_get_last_error(pcpConnInfo) ? pstrdup(pcp_get_last_error(pcpConnInfo)) : NULL; + + pcp_disconnect(pcpConnInfo); + pcp_free_connection(pcpConnInfo); + + MemoryContextSwitchTo(oldcontext); + ereport(ERROR, (errcode(ERRCODE_INTERNAL_ERROR), + errmsg("failed to get pool status"), + errdetail("%s\n", error ? error : "unknown reason"))); + } + + nrows = pcp_result_slot_count(pcpResInfo); + pcp_disconnect(pcpConnInfo); + /* Construct a tuple descriptor for the result rows */ +#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 120000) + tupdesc = CreateTemplateTupleDesc(NUM_COLS); +#else + tupdesc = CreateTemplateTupleDesc(NUM_COLS, false); +#endif + an = 1; + TupleDescInitEntry(tupdesc, an++, "database", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "username", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "start_time", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "client_connection_count", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "major", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "minor", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "backend_connection_time", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "client_connection_time", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "client_idle_duration", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "client_disconnection_time", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "pool_counter", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "backend_pid", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "connected", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "pid", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "backend_id", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "status", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "load_balance_node", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "client_host", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "client_port", TEXTOID, -1, 0); + TupleDescInitEntry(tupdesc, an++, "statement", TEXTOID, -1, 0); + + /* + * Generate attribute metadata needed later to produce tuples from raw + * C strings + */ + attinmeta = TupleDescGetAttInMetadata(tupdesc); + funcctx->attinmeta = attinmeta; + + if (nrows > 0) + { + funcctx->max_calls = nrows; + + /* got results, keep track of them */ + funcctx->user_fctx = pcpConnInfo; + } + else + { + /* fast track when no results */ + MemoryContextSwitchTo(oldcontext); + SRF_RETURN_DONE(funcctx); + } + + MemoryContextSwitchTo(oldcontext); + } + + /* stuff done on every call of the function */ + funcctx = SRF_PERCALL_SETUP(); + + /* initialize per-call variables */ + call_cntr = funcctx->call_cntr; + max_calls = funcctx->max_calls; + + pcpConnInfo = (PCPConnInfo *) funcctx->user_fctx; + pcpResInfo = (PCPResultInfo *) pcpConnInfo->pcpResInfo; + attinmeta = funcctx->attinmeta; + + if (call_cntr < max_calls) /* executed while there is more left to send */ + { + char *values[NUM_COLS]; + HeapTuple tuple; + Datum result; + int i = 0; + POOL_REPORT_POOLS *pools = (POOL_REPORT_POOLS *) pcp_get_binary_data(pcpResInfo, call_cntr); + + values[i++] = pstrdup(pools->database); + values[i++] = pstrdup(pools->username); + values[i++] = pstrdup(pools->process_start_time); + values[i++] = pstrdup(pools->client_connection_count); + values[i++] = pstrdup(pools->pool_majorversion); + values[i++] = pstrdup(pools->pool_minorversion); + values[i++] = pstrdup(pools->backend_connection_time); + values[i++] = pstrdup(pools->client_connection_time); + values[i++] = pstrdup(pools->client_idle_duration); + values[i++] = pstrdup(pools->client_disconnection_time); + values[i++] = pstrdup(pools->pool_counter); + values[i++] = pstrdup(pools->pool_backendpid); + values[i++] = pstrdup(pools->pool_connected); + values[i++] = pstrdup(pools->pool_pid); + values[i++] = pstrdup(pools->backend_id); + values[i++] = pstrdup(pools->status); + values[i++] = pstrdup(pools->load_balance_node); + values[i++] = pstrdup(pools->client_host); + values[i++] = pstrdup(pools->client_port); + values[i++] = pstrdup(pools->statement); + + /* build the tuple */ + tuple = BuildTupleFromCStrings(attinmeta, values); + + /* make the tuple into a datum */ + result = HeapTupleGetDatum(tuple); + + SRF_RETURN_NEXT(funcctx, result); + } + else + { + /* do when there is no more left */ + pcp_free_connection(pcpConnInfo); + SRF_RETURN_DONE(funcctx); + } +} diff --git a/src/sql/pgpool_adm/pgpool_adm.control b/src/sql/pgpool_adm/pgpool_adm.control index b02b15441..ee8088042 100644 --- a/src/sql/pgpool_adm/pgpool_adm.control +++ b/src/sql/pgpool_adm/pgpool_adm.control @@ -1,5 +1,5 @@ # pcp extension comment = 'Administrative functions for pgPool' -default_version = '1.5' +default_version = '1.6' module_pathname = '$libdir/pgpool_adm' relocatable = true diff --git a/src/sql/pgpool_adm/pgpool_adm.h b/src/sql/pgpool_adm/pgpool_adm.h index e10e81e56..3f23f4f05 100644 --- a/src/sql/pgpool_adm/pgpool_adm.h +++ b/src/sql/pgpool_adm/pgpool_adm.h @@ -3,7 +3,8 @@ * pgpool_adm.h * * - * Copyright (c) 2002-2018, PostgreSQL Global Development Group + * Copyright (c) 2002-2025, PostgreSQL Global Development Group + * Copyright (c) 2019-2025, PgPool Global Development Group * * Author: Jehan-Guillaume (ioguix) de Rorthais * @@ -25,6 +26,7 @@ Datum _pcp_pool_status(PG_FUNCTION_ARGS); Datum _pcp_node_count(PG_FUNCTION_ARGS); Datum _pcp_attach_node(PG_FUNCTION_ARGS); Datum _pcp_detach_node(PG_FUNCTION_ARGS); +Datum _pcp_proc_info(PG_FUNCTION_ARGS); PG_FUNCTION_INFO_V1(_pcp_node_info); PG_FUNCTION_INFO_V1(_pcp_health_check_stats); @@ -32,5 +34,6 @@ PG_FUNCTION_INFO_V1(_pcp_pool_status); PG_FUNCTION_INFO_V1(_pcp_node_count); PG_FUNCTION_INFO_V1(_pcp_attach_node); PG_FUNCTION_INFO_V1(_pcp_detach_node); +PG_FUNCTION_INFO_V1(_pcp_proc_info); #endif diff --git a/src/test/regression/tests/038.pcp_commands/test.sh b/src/test/regression/tests/038.pcp_commands/test.sh index 5b6e7b18c..cb75d4a9d 100755 --- a/src/test/regression/tests/038.pcp_commands/test.sh +++ b/src/test/regression/tests/038.pcp_commands/test.sh @@ -51,13 +51,40 @@ else fi fi +# +# test for pcp_proc_info, pgpool_adm: pcp_proc_info +WHOAMI=`whoami` +./shutdownall +./startall +wait_for_pgpool_startup +$PSQL -a -h localhost -c "SELECT pg_sleep(1)" test & +$PSQL -a -h localhost test > result 2>&1 < '', port => $PCP_PORT, username => '$WHOAMI', password => '$WHOAMI') +WHERE connected = '1' AND backend_id = '0' AND statement = 'SELECT pg_sleep(1)' +EOF +if [ $? != 0 ];then + r2=fail + echo "test2 failed" +else + cmp ../expected result + if [ $? != 0 ];then + r2=fail + echo "test2 failed" + else + r2=ok + fi +fi +wait ./shutdownall -if [ $r1 = ok ]; then +if [ $r1 = ok -a $r2 = ok ]; then echo "all test succeeded" exit 0 else echo "some tests failed" echo "test1: $r1" + echo "test2: $r2" exit 1 fi diff --git a/src/tools/pcp/pcp_frontend_client.c b/src/tools/pcp/pcp_frontend_client.c index a72b1327f..be192dd27 100644 --- a/src/tools/pcp/pcp_frontend_client.c +++ b/src/tools/pcp/pcp_frontend_client.c @@ -4,7 +4,7 @@ * pgpool: a language independent connection pool server for PostgreSQL * written by Tatsuo Ishii * - * Copyright (c) 2003-2024 PgPool Global Development Group + * Copyright (c) 2003-2025 PgPool Global Development Group * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby @@ -735,14 +735,15 @@ output_procinfo_result(PCPResultInfo * pcpResInfo, bool all, bool verbose) "Database", "Username", "Start time", "Client connection count", "Major", "Minor", "Backend connection time", "Client connection time", "Client idle duration", "Client disconnection time", "Pool Counter", "Backend PID", - "Connected", "PID", "Backend ID", "Status", "Load balance node" + "Connected", "PID", "Backend ID", "Status", "Load balance node", + "client_host", "client_port", "statement" }; const char *types[] = { "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", "s", - "s" + "s", "s", "s", "s" }; @@ -750,7 +751,7 @@ output_procinfo_result(PCPResultInfo * pcpResInfo, bool all, bool verbose) format = format_titles(titles, types, sizeof(titles)/sizeof(char *)); else { - format = "%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n"; + format = "%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n"; } for (i = 0; i < array_size; i++) @@ -780,7 +781,10 @@ output_procinfo_result(PCPResultInfo * pcpResInfo, bool all, bool verbose) pools->pool_pid, pools->backend_id, pools->status, - pools->load_balance_node); + pools->load_balance_node, + pools->client_host, + pools->client_port, + pools->statement); } if (printed == false) printf("No process information available\n\n"); diff --git a/src/utils/pool_health_check_stats.c b/src/utils/pool_health_check_stats.c index f717b1a3e..bb0ca97e8 100644 --- a/src/utils/pool_health_check_stats.c +++ b/src/utils/pool_health_check_stats.c @@ -4,7 +4,7 @@ * pgpool: a language independent connection pool server for PostgreSQL * written by Tatsuo Ishii * - * Copyright (c) 2003-2021 PgPool Global Development Group + * Copyright (c) 2003-2025 PgPool Global Development Group * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby @@ -85,7 +85,10 @@ int * pool_report_pools_offsets(int *n) offsetof(POOL_REPORT_POOLS, pool_backendpid), offsetof(POOL_REPORT_POOLS, pool_connected), offsetof(POOL_REPORT_POOLS, status), - offsetof(POOL_REPORT_POOLS, load_balance_node) + offsetof(POOL_REPORT_POOLS, load_balance_node), + offsetof(POOL_REPORT_POOLS, client_host), + offsetof(POOL_REPORT_POOLS, client_port), + offsetof(POOL_REPORT_POOLS, statement) }; *n = sizeof(offsettbl)/sizeof(int); diff --git a/src/utils/pool_process_reporting.c b/src/utils/pool_process_reporting.c index 71f871bc4..01761c73e 100644 --- a/src/utils/pool_process_reporting.c +++ b/src/utils/pool_process_reporting.c @@ -5,7 +5,7 @@ * pgpool: a language independent connection pool server for PostgreSQL * written by Tatsuo Ishii * - * Copyright (c) 2003-2024 PgPool Global Development Group + * Copyright (c) 2003-2025 PgPool Global Development Group * * Permission to use, copy, modify, and distribute this software and * its documentation for any purpose and without fee is hereby @@ -1685,6 +1685,20 @@ get_pools(int *nrows) StrNCpy(pools[lines].load_balance_node, "1", POOLCONFIG_MAXPROCESSSTATUSLEN); else StrNCpy(pools[lines].load_balance_node, "0", POOLCONFIG_MAXPROCESSSTATUSLEN); + + StrNCpy(pools[lines].client_host, pi->client_host, NI_MAXHOST); + StrNCpy(pools[lines].client_port, pi->client_port, NI_MAXSERV); + + /* + * If this the statement was sent to backend id + * report the statement. + */ + if (is_pi_set(pi->node_ids, backend_id)) + { + StrNCpy(pools[lines].statement, pi->statement, MAXSTMTLEN); + elog(LOG, "pi->node_ids[0]:%ld pi->node_ids[1]:%ld", + pi->node_ids[0], pi->node_ids[1]); + } lines++; } } @@ -1705,7 +1719,7 @@ pools_reporting(POOL_CONNECTION * frontend, POOL_CONNECTION_POOL * backend) "backend_id", "database", "username", "backend_connection_time", "client_connection_time", "client_disconnection_time", "client_idle_duration", "majorversion", "minorversion", "pool_counter", "pool_backendpid", "pool_connected", - "status", "load_balance_node"}; + "status", "load_balance_node", "client_host", "client_port", "statement"}; int n; int *offsettbl; int nrows; -- 2.25.1