On Tue, Dec 08, 2020 at 05:29:11PM -0800, Andres Freund wrote: > I suspect this is related to the pg_upgrade test and the main regression > test running at the same time. We have the following in > src/test/regress/GNUMakefile.
Yes, this one is not completely new to -hackers. See patch 0002 here that slightly touched the topic by creating a specific makefile rule, but I never got back to it as I never got annoyed by this problem: https://www.postgresql.org/message-id/20200511.171354.514381788845037011.horikyota....@gmail.com What we have here is not a solution though... > It's not clear to me why we have this logic in the makefile at all? > Somebody taught pg_regress to do so, but only on windows... See > convert_sourcefiles_in(). ... Because we may still introduce this problem again if some new stuff uses src/test/pg_regress in a way similar to pg_upgrade, triggering again tablespace-setup. Something like the attached may be enough, though I have not spent much time checking the surroundings, Windows included. > The other thing that confuses me is why I started getting that error in > *multiple* branches recently, even though I have used the parallel > check-world for ages. Perhaps you have just increased -j lately or moved to a faster machine where there are higher changes of collision? -- Michael
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index 04aa7fd9f5..355477a8ee 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -106,7 +106,6 @@ outputdir="$temp_root/regress"
EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --outputdir=$outputdir"
export EXTRA_REGRESS_OPTS
mkdir "$outputdir"
-mkdir "$outputdir"/testtablespace
logdir=`pwd`/log
rm -rf "$logdir"
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index c830627b00..583f975f08 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -114,13 +114,6 @@ submake-contrib-spi: | submake-libpgport submake-generated-headers
.PHONY: submake-contrib-spi
-# Tablespace setup
-
-.PHONY: tablespace-setup
-tablespace-setup:
- rm -rf ./testtablespace
- mkdir ./testtablespace
-
##
## Run tests
@@ -128,19 +121,19 @@ tablespace-setup:
REGRESS_OPTS = --dlpath=. --max-concurrent-tests=20 $(EXTRA_REGRESS_OPTS)
-check: all tablespace-setup
+check: all
$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
-check-tests: all tablespace-setup | temp-install
+check-tests: all | temp-install
$(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TESTS) $(EXTRA_TESTS)
-installcheck: all tablespace-setup
+installcheck: all
$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule $(EXTRA_TESTS)
-installcheck-parallel: all tablespace-setup
+installcheck-parallel: all
$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
-installcheck-tests: all tablespace-setup
+installcheck-tests: all
$(pg_regress_installcheck) $(REGRESS_OPTS) $(TESTS) $(EXTRA_TESTS)
standbycheck: all
@@ -152,10 +145,10 @@ runcheck: check
runtest: installcheck
runtest-parallel: installcheck-parallel
-bigtest: all tablespace-setup
+bigtest: all
$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
-bigcheck: all tablespace-setup | temp-install
+bigcheck: all | temp-install
$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 23d7d0beb2..111457ee8f 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -506,24 +506,22 @@ convert_sourcefiles_in(const char *source_subdir, const char *dest_dir, const ch
snprintf(testtablespace, MAXPGPATH, "%s/testtablespace", outputdir);
-#ifdef WIN32
-
/*
- * On Windows only, clean out the test tablespace dir, or create it if it
- * doesn't exist so as it is possible to run the regression tests as a
- * Windows administrative user account with the restricted token obtained
- * when starting pg_regress. On other platforms we expect the Makefile to
- * take care of that.
+ * Clean out the test tablespace dir, or create it if it doesn't exist.
+ * On Windows, doing this cleanup here makes possible to run the
+ * regression tests as a Windows administrative user account with the
+ * restricted token obtained when starting pg_regress.
*/
if (directory_exists(testtablespace))
+ {
if (!rmtree(testtablespace, true))
{
fprintf(stderr, _("\n%s: could not remove test tablespace \"%s\"\n"),
progname, testtablespace);
exit(2);
}
+ }
make_directory(testtablespace);
-#endif
/* finally loop on each file and do the replacement */
for (name = names; *name; name++)
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 266098e193..3e9110e4ed 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -571,7 +571,6 @@ sub upgradecheck
my $outputdir = "$tmp_root/regress";
my @EXTRA_REGRESS_OPTS = ("--outputdir=$outputdir");
mkdir "$outputdir" || die $!;
- mkdir "$outputdir/testtablespace" || die $!;
my $logdir = "$topdir/src/bin/pg_upgrade/log";
rmtree($logdir);
signature.asc
Description: PGP signature
