external
/
pg_stat_monitor
mirror of https://github.com/percona/pg_stat_monitor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PG-520 pg_stat_monitor does not work with PG15 

PG 15 requires additional shared memory and LWLocks requests to be made from the
newly introduced shmem_request_hook and disallows the requests initiated
from outside the hook.
The commit makes moves the additional shared memory and LWLocks requests
from _PG_init to shmem_request_hook for PG15
pull/311/head
Muhammad Usama 2022-09-15 13:00:05 +05:00 committed by Hamid Akhtar
parent 634f0ce580
commit 0fe9908d5f
1 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pg_stat_monitor.c
View File

@ -81,10 +81,15 @@ static int get_histogram_bucket(double q_time);
static bool IsSystemInitialized(void); static bool IsSystemInitialized(void);
static bool dump_queries_buffer(int bucket_id, unsigned char *buf, int buf_len); static bool dump_queries_buffer(int bucket_id, unsigned char *buf, int buf_len);
static double time_diff(struct timeval end, struct timeval start); static double time_diff(struct timeval end, struct timeval start);
static void request_additional_shared_resources(void);
/* Saved hook values in case of unload */ /* Saved hook values in case of unload */
#if PG_VERSION_NUM >= 150000
static void pgss_shmem_request(void);
static shmem_request_hook_type prev_shmem_request_hook = NULL;
#endif
#if PG_VERSION_NUM >= 130000 #if PG_VERSION_NUM >= 130000
static planner_hook_type planner_hook_next = NULL; static planner_hook_type planner_hook_next = NULL;
#endif #endif
@ -256,17 +261,15 @@ _PG_init(void)
elog(ERROR, "pg_stat_monitor: query comments regcomp() failed, return code=(%d)\n", rc); elog(ERROR, "pg_stat_monitor: query comments regcomp() failed, return code=(%d)\n", rc);
} }
/*
* Request additional shared resources. (These are no-ops if we're not in
* the postmaster process.) We'll allocate or attach to the shared
* resources in pgss_shmem_startup().
*/
RequestAddinShmemSpace(hash_memsize() + HOOK_STATS_SIZE);
RequestNamedLWLockTranche("pg_stat_monitor", 1);
/* /*
* Install hooks. * Install hooks.
*/ */
#if PG_VERSION_NUM >= 150000
prev_shmem_request_hook = shmem_request_hook;
shmem_request_hook = pgss_shmem_request;
#else
request_additional_shared_resources();
#endif
prev_shmem_startup_hook = shmem_startup_hook; prev_shmem_startup_hook = shmem_startup_hook;
shmem_startup_hook = pgss_shmem_startup; shmem_startup_hook = pgss_shmem_startup;
prev_post_parse_analyze_hook = post_parse_analyze_hook; prev_post_parse_analyze_hook = post_parse_analyze_hook;
@ -333,6 +336,17 @@ pgss_shmem_startup(void)
pgss_startup(); pgss_startup();
} }
static void
request_additional_shared_resources(void)
{
/*
* Request additional shared resources. (These are no-ops if we're not in
* the postmaster process.) We'll allocate or attach to the shared
* resources in pgss_shmem_startup().
*/
RequestAddinShmemSpace(hash_memsize() + HOOK_STATS_SIZE);
RequestNamedLWLockTranche("pg_stat_monitor", 1);
}
/* /*
* Select the version of pg_stat_monitor. * Select the version of pg_stat_monitor.
*/ */
@ -342,6 +356,20 @@ pg_stat_monitor_version(PG_FUNCTION_ARGS)
PG_RETURN_TEXT_P(cstring_to_text(BUILD_VERSION)); PG_RETURN_TEXT_P(cstring_to_text(BUILD_VERSION));
} }
#if PG_VERSION_NUM >= 150000
/*
* shmem_request hook: request additional shared resources. We'll allocate or
* attach to the shared resources in pgss_shmem_startup().
*/
static void
pgss_shmem_request(void)
{
if (prev_shmem_request_hook)
prev_shmem_request_hook();
request_additional_shared_resources();
}
#endif
#if PG_VERSION_NUM >= 140000 #if PG_VERSION_NUM >= 140000
/* /*
* Post-parse-analysis hook: mark query with a queryId * Post-parse-analysis hook: mark query with a queryId