mirror of
https://github.com/postgres/postgres.git
synced 2026-02-23 09:52:14 -05:00
f4083c4975
The module relies on a shmem exit callback to clean up any injection
points linked to a specific process. One of the tests checks for the
case of an injection point name reused in a second connection where the
first connection should clean it up, but it did not count for the fact
that the shmem exit callback of the first connection may not have run
when the second connection begins its work.
The regress library includes a wait_pid() that can be used for this
purpose, instead of a custom wait logic, so let's rely on it to wait for
the first connection to exit before working with the second connection.
The module gains a REGRESS_OPTS to be able to look at the regress
library's dlpath.
This issue could be reproduced with a hardcoded sleep() in the shmem
exit callback, and the CI has been able to trigger it sporadically.
Oversight in f587338dec.
Reported-by: Bharath Rupireddy
Reviewed-by: Andrey Borodin
Discussion: https://postgr.es/m/ZhOd3NXAutteokGL@paquier.xyz
70 lines
2.8 KiB
SQL
70 lines
2.8 KiB
SQL
CREATE EXTENSION injection_points;
|
|
|
|
\getenv libdir PG_LIBDIR
|
|
\getenv dlsuffix PG_DLSUFFIX
|
|
\set regresslib :libdir '/regress' :dlsuffix
|
|
|
|
CREATE FUNCTION wait_pid(int)
|
|
RETURNS void
|
|
AS :'regresslib'
|
|
LANGUAGE C STRICT;
|
|
|
|
SELECT injection_points_attach('TestInjectionBooh', 'booh');
|
|
SELECT injection_points_attach('TestInjectionError', 'error');
|
|
SELECT injection_points_attach('TestInjectionLog', 'notice');
|
|
SELECT injection_points_attach('TestInjectionLog2', 'notice');
|
|
|
|
SELECT injection_points_run('TestInjectionBooh'); -- nothing
|
|
SELECT injection_points_run('TestInjectionLog2'); -- notice
|
|
SELECT injection_points_run('TestInjectionLog'); -- notice
|
|
SELECT injection_points_run('TestInjectionError'); -- error
|
|
|
|
-- Re-load cache and run again.
|
|
\c
|
|
SELECT injection_points_run('TestInjectionLog2'); -- notice
|
|
SELECT injection_points_run('TestInjectionLog'); -- notice
|
|
SELECT injection_points_run('TestInjectionError'); -- error
|
|
|
|
-- Remove one entry and check the remaining entries.
|
|
SELECT injection_points_detach('TestInjectionError'); -- ok
|
|
SELECT injection_points_run('TestInjectionLog'); -- notice
|
|
SELECT injection_points_run('TestInjectionError'); -- nothing
|
|
-- More entries removed, letting TestInjectionLog2 to check the same
|
|
-- callback used in more than one point.
|
|
SELECT injection_points_detach('TestInjectionLog'); -- ok
|
|
SELECT injection_points_run('TestInjectionLog'); -- nothing
|
|
SELECT injection_points_run('TestInjectionError'); -- nothing
|
|
SELECT injection_points_run('TestInjectionLog2'); -- notice
|
|
|
|
SELECT injection_points_detach('TestInjectionLog'); -- fails
|
|
|
|
SELECT injection_points_run('TestInjectionLog2'); -- notice
|
|
SELECT injection_points_detach('TestInjectionLog2');
|
|
|
|
-- Runtime conditions
|
|
SELECT injection_points_attach('TestConditionError', 'error');
|
|
-- Any follow-up injection point attached will be local to this process.
|
|
SELECT injection_points_set_local();
|
|
SELECT injection_points_attach('TestConditionLocal1', 'error');
|
|
SELECT injection_points_attach('TestConditionLocal2', 'notice');
|
|
SELECT injection_points_run('TestConditionLocal1'); -- error
|
|
SELECT injection_points_run('TestConditionLocal2'); -- notice
|
|
|
|
SELECT pg_backend_pid() AS oldpid \gset
|
|
|
|
-- reload, local injection points should be gone.
|
|
\c
|
|
-- Wait for the previous backend process to exit, ensuring that its local
|
|
-- injection points are cleaned up.
|
|
SELECT wait_pid(:'oldpid');
|
|
SELECT injection_points_run('TestConditionLocal1'); -- nothing
|
|
SELECT injection_points_run('TestConditionLocal2'); -- nothing
|
|
SELECT injection_points_run('TestConditionError'); -- error
|
|
SELECT injection_points_detach('TestConditionError');
|
|
-- Attaching injection points that use the same name as one defined locally
|
|
-- previously should work.
|
|
SELECT injection_points_attach('TestConditionLocal1', 'error');
|
|
SELECT injection_points_detach('TestConditionLocal1');
|
|
|
|
DROP EXTENSION injection_points;
|
|
DROP FUNCTION wait_pid;
|