postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-17 19:13:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add shmem_request_hook

Browse Source 
This patch consolidates all shared memory requests in a
shmem_request_hook. While there are no strict requirements when
to request shared memory for PG < 15 in PG 15 it has to happen
in the shmem_request_hook otherwise the request will be blocked.

https://github.com/postgres/postgres/commit/4f2400cb
This commit is contained in:
Sven Klemm 2022-06-02 05:55:33 +02:00 committed by Sven Klemm
parent f059e00fad
commit 1ef515eb7a
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/loader/loader.c
View File

@ -114,6 +114,9 @@ int ts_guc_bgw_launcher_poll_time = BGW_LAUNCHER_POLL_TIME_MS;
/* This is the hook that existed before the loader was installed */ /* This is the hook that existed before the loader was installed */
static post_parse_analyze_hook_type prev_post_parse_analyze_hook; static post_parse_analyze_hook_type prev_post_parse_analyze_hook;
static shmem_startup_hook_type prev_shmem_startup_hook; static shmem_startup_hook_type prev_shmem_startup_hook;
#if PG15_GE
static shmem_request_hook_type prev_shmem_request_hook;
#endif
static ProcessUtility_hook_type prev_ProcessUtility_hook; static ProcessUtility_hook_type prev_ProcessUtility_hook;
/* This is timescaleDB's versioned-extension's post_parse_analyze_hook */ /* This is timescaleDB's versioned-extension's post_parse_analyze_hook */
@ -609,6 +612,25 @@ timescaledb_shmem_startup_hook(void)
ts_function_telemetry_shmem_startup(); ts_function_telemetry_shmem_startup();
} }
/*
* PG15 requires all shared memory requests to be requested in a dedicated
* hook. We group all our shared memory requests in this function and use
* it as a normal function for PG < 14 and as a hook for PG 15+.
*/
static void
timescaledb_shmem_request_hook(void)
{
#if PG15_GE
if (prev_shmem_request_hook)
prev_shmem_request_hook();
#endif
ts_bgw_counter_shmem_alloc();
ts_bgw_message_queue_alloc();
ts_lwlocks_shmem_alloc();
ts_function_telemetry_shmem_alloc();
}
static void static void
extension_mark_loader_present() extension_mark_loader_present()
{ {
@ -628,14 +650,14 @@ _PG_init(void)
elog(INFO, "timescaledb loaded"); elog(INFO, "timescaledb loaded");
ts_bgw_counter_shmem_alloc(); #if PG15_LT
ts_bgw_message_queue_alloc(); timescaledb_shmem_request_hook();
ts_lwlocks_shmem_alloc(); #endif
ts_bgw_cluster_launcher_register(); ts_bgw_cluster_launcher_register();
ts_bgw_counter_setup_gucs(); ts_bgw_counter_setup_gucs();
ts_bgw_interface_register_api_version(); ts_bgw_interface_register_api_version();
ts_seclabel_init(); ts_seclabel_init();
ts_function_telemetry_shmem_alloc();
/* This is a safety-valve variable to prevent loading the full extension */ /* This is a safety-valve variable to prevent loading the full extension */
DefineCustomBoolVariable(GUC_DISABLE_LOAD_NAME, DefineCustomBoolVariable(GUC_DISABLE_LOAD_NAME,
@ -676,6 +698,11 @@ _PG_init(void)
post_parse_analyze_hook = post_analyze_hook; post_parse_analyze_hook = post_analyze_hook;
shmem_startup_hook = timescaledb_shmem_startup_hook; shmem_startup_hook = timescaledb_shmem_startup_hook;
#if PG15_GE
prev_shmem_request_hook = shmem_request_hook;
shmem_request_hook = timescaledb_shmem_request_hook;
#endif
/* register utility hook to handle a distributed database drop */ /* register utility hook to handle a distributed database drop */
prev_ProcessUtility_hook = ProcessUtility_hook; prev_ProcessUtility_hook = ProcessUtility_hook;
ProcessUtility_hook = loader_process_utility_hook; ProcessUtility_hook = loader_process_utility_hook;