database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-29 16:21:20 +03:00
Code

Fix using injection points at backend startup in EXEC_BACKEND mode

Browse Source 
Commit 86db52a506 changed the locking of injection points to use only
atomic ops and spinlocks, to make it possible to define injection
points in processes that don't have a PGPROC entry (yet). However, it
didn't work in EXEC_BACKEND mode, because the pointer to shared memory
area was not initialized until the process "attaches" to all the
shared memory structs. To fix, pass the pointer to the child process
along with other global variables that need to be set up early.

Backpatch-through: 17
This commit is contained in:
Heikki Linnakangas 2024-07-26 14:55:04 +03:00
parent f06a632a77
commit f19beba3e3
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/postmaster/launch_backend.c
View File

@ -63,6 +63,7 @@
#include "utils/builtins.h"
#include "utils/datetime.h"
#include "utils/guc.h"
#include "utils/injection_point.h"
#include "utils/memutils.h"
#include "utils/timestamp.h"
@ -104,6 +105,9 @@ typedef struct
void *UsedShmemSegAddr;
slock_t *ShmemLock;
struct bkend *ShmemBackendArray;
#ifdef USE_INJECTION_POINTS
struct InjectionPointsCtl *ActiveInjectionPoints;
#endif
#ifndef HAVE_SPINLOCKS
PGSemaphore *SpinlockSemaArray;
#endif
@ -722,6 +726,10 @@ save_backend_variables(BackendParameters *param, ClientSocket *client_sock,
param->ShmemLock = ShmemLock;
param->ShmemBackendArray = ShmemBackendArray;
#ifdef USE_INJECTION_POINTS
param->ActiveInjectionPoints = ActiveInjectionPoints;
#endif
#ifndef HAVE_SPINLOCKS
param->SpinlockSemaArray = SpinlockSemaArray;
#endif
@ -981,6 +989,10 @@ restore_backend_variables(BackendParameters *param)
ShmemLock = param->ShmemLock;
ShmemBackendArray = param->ShmemBackendArray;
#ifdef USE_INJECTION_POINTS
ActiveInjectionPoints = param->ActiveInjectionPoints;
#endif
#ifndef HAVE_SPINLOCKS
SpinlockSemaArray = param->SpinlockSemaArray;
#endif

2
src/backend/utils/misc/injection_point.c
View File

@ -85,7 +85,7 @@ typedef struct InjectionPointsCtl
InjectionPointEntry entries[MAX_INJECTION_POINTS];
} InjectionPointsCtl;
static InjectionPointsCtl *ActiveInjectionPoints;
NON_EXEC_STATIC InjectionPointsCtl *ActiveInjectionPoints;
/*
* Backend local cache of injection callbacks already loaded, stored in

4
src/include/utils/injection_point.h
View File

@ -37,4 +37,8 @@ extern void InjectionPointAttach(const char *name,
extern void InjectionPointRun(const char *name);
extern bool InjectionPointDetach(const char *name);
#ifdef EXEC_BACKEND
extern PGDLLIMPORT struct InjectionPointsCtl *ActiveInjectionPoints;
#endif
#endif /* INJECTION_POINT_H */