mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid 037_invalid_database.pl hang under debug_discard_caches.

Browse Source 
Back-patch to v12 (all supported versions).
This commit is contained in:
Noah Misch 2024-09-27 15:28:56 -07:00
parent a613edc5c2
commit 7f90b72742
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/test/recovery/t/037_invalid_database.pl
View File

@ -84,7 +84,10 @@ is($node->psql('postgres', 'DROP DATABASE regression_invalid'),
# Test that interruption of DROP DATABASE is handled properly. To ensure the # Test that interruption of DROP DATABASE is handled properly. To ensure the
# interruption happens at the appropriate moment, we lock pg_tablespace. DROP # interruption happens at the appropriate moment, we lock pg_tablespace. DROP
# DATABASE scans pg_tablespace once it has reached the "irreversible" part of # DATABASE scans pg_tablespace once it has reached the "irreversible" part of
# dropping the database, making it a suitable point to wait. # dropping the database, making it a suitable point to wait. Since relcache
# init reads pg_tablespace, establish each connection before locking. This
# avoids a connection-time hang with debug_discard_caches.
my $cancel = $node->background_psql('postgres', on_error_stop => 1);
my $bgpsql = $node->background_psql('postgres', on_error_stop => 0); my $bgpsql = $node->background_psql('postgres', on_error_stop => 0);
my $pid = $bgpsql->query('SELECT pg_backend_pid()'); my $pid = $bgpsql->query('SELECT pg_backend_pid()');
@ -100,14 +103,19 @@ ok( $bgpsql->query_safe(
# Try to drop. This will wait due to the still held lock. # Try to drop. This will wait due to the still held lock.
$bgpsql->query_until(qr//, "DROP DATABASE regression_invalid_interrupt;\n"); $bgpsql->query_until(qr//, "DROP DATABASE regression_invalid_interrupt;\n");
# Ensure we're waiting for the lock
$node->poll_query_until('postgres',
qq(SELECT EXISTS(SELECT * FROM pg_locks WHERE NOT granted AND relation = 'pg_tablespace'::regclass AND mode = 'AccessShareLock');)
);
# and finally interrupt the DROP DATABASE # Once the DROP DATABASE is waiting for the lock, interrupt it.
ok($node->safe_psql('postgres', "SELECT pg_cancel_backend($pid)"), ok( $cancel->query_safe(
qq(
DO \$\$
BEGIN
WHILE NOT EXISTS(SELECT * FROM pg_locks WHERE NOT granted AND relation = 'pg_tablespace'::regclass AND mode = 'AccessShareLock') LOOP
PERFORM pg_sleep(.1);
END LOOP;
END\$\$;
SELECT pg_cancel_backend($pid);)),
"canceling DROP DATABASE"); "canceling DROP DATABASE");
$cancel->quit();
# wait for cancellation to be processed # wait for cancellation to be processed
ok( pump_until( ok( pump_until(
@ -116,7 +124,8 @@ ok( pump_until(
"cancel processed"); "cancel processed");
$bgpsql->{stderr} = ''; $bgpsql->{stderr} = '';
# verify that connection to the database aren't allowed # Verify that connections to the database aren't allowed. The backend checks
# this before relcache init, so the lock won't interfere.
is($node->psql('regression_invalid_interrupt', ''), is($node->psql('regression_invalid_interrupt', ''),
2, "can't connect to invalid_interrupt database"); 2, "can't connect to invalid_interrupt database");