From 28245b8424e29808f4f714482077a762cab0c5c5 Mon Sep 17 00:00:00 2001 From: Noah Misch <noah@leadboat.com> Date: Wed, 12 Nov 2014 07:33:17 -0500 Subject: [PATCH] Use just one database connection in the "tablespace" test. On Windows, DROP TABLESPACE has a race condition when run concurrently with other processes having opened files in the tablespace. This led to a rare failure on buildfarm member frogmouth. Back-patch to 9.4, where the reconnection was introduced. --- src/backend/commands/tablespace.c | 7 +++++++ src/test/regress/input/tablespace.source | 3 +-- src/test/regress/output/tablespace.source | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c index 378e355adcc..616308bc2d3 100644 --- a/src/backend/commands/tablespace.c +++ b/src/backend/commands/tablespace.c @@ -493,6 +493,13 @@ DropTableSpace(DropTableSpaceStmt *stmt) * but we can't tell them apart from important data files that we * mustn't delete. So instead, we force a checkpoint which will clean * out any lingering files, and try again. + * + * XXX On Windows, an unlinked file persists in the directory listing + * until no process retains an open handle for the file. The DDL + * commands that schedule files for unlink send invalidation messages + * directing other PostgreSQL processes to close the files. DROP + * TABLESPACE should not give up on the tablespace becoming empty + * until all relevant invalidation processing is complete. */ RequestCheckpoint(CHECKPOINT_IMMEDIATE | CHECKPOINT_FORCE | CHECKPOINT_WAIT); if (!destroy_tablespace_directories(tablespaceoid, false)) diff --git a/src/test/regress/input/tablespace.source b/src/test/regress/input/tablespace.source index e259254b02c..75ec689498f 100644 --- a/src/test/regress/input/tablespace.source +++ b/src/test/regress/input/tablespace.source @@ -71,8 +71,7 @@ ALTER TABLESPACE testspace OWNER TO tablespace_testuser1; SET SESSION ROLE tablespace_testuser2; CREATE TABLE tablespace_table (i int) TABLESPACE testspace; -- fail - -\c - +RESET ROLE; ALTER TABLESPACE testspace RENAME TO testspace_renamed; diff --git a/src/test/regress/output/tablespace.source b/src/test/regress/output/tablespace.source index a30651087b9..ca606508f81 100644 --- a/src/test/regress/output/tablespace.source +++ b/src/test/regress/output/tablespace.source @@ -91,7 +91,7 @@ ALTER TABLESPACE testspace OWNER TO tablespace_testuser1; SET SESSION ROLE tablespace_testuser2; CREATE TABLE tablespace_table (i int) TABLESPACE testspace; -- fail ERROR: permission denied for tablespace testspace -\c - +RESET ROLE; ALTER TABLESPACE testspace RENAME TO testspace_renamed; ALTER TABLE ALL IN TABLESPACE testspace_renamed SET TABLESPACE pg_default; ALTER INDEX ALL IN TABLESPACE testspace_renamed SET TABLESPACE pg_default; -- GitLab