From dccee0f2b72648b8b3c42883a7d99210eb813f30 Mon Sep 17 00:00:00 2001
From: Thomas Munro <tmunro@postgresql.org>
Date: Sat, 15 Jan 2022 00:38:44 +1300
Subject: [PATCH] Revert "Test replay of regression tests."

This reverts commit 123828a7fa563025d0ceee10cf1b2a253cd05319.

Discussion: https://postgr.es/m/CA%2BhUKG%2BGBC-6QhOKt6Y7ccrXSjbRHB7Di295%3D0rAGhE7a7hSrQ%40mail.gmail.com
---
 doc/src/sgml/regress.sgml                 | 11 ----
 src/test/recovery/Makefile                |  6 +-
 src/test/recovery/t/027_stream_regress.pl | 80 -----------------------
 src/tools/msvc/vcregress.pl               |  2 -
 4 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 src/test/recovery/t/027_stream_regress.pl

diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index eee2bff037..724ef566e7 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -289,17 +289,6 @@ make check-world PG_TEST_EXTRA='kerberos ldap ssl'
       </para>
      </listitem>
     </varlistentry>
-
-    <varlistentry>
-     <term><literal>wal_consistency_checking</literal></term>
-     <listitem>
-      <para>
-       Uses <literal>wal_consistency_checking=all</literal> while running
-       certain tests under <filename>src/test/recovery</filename>.  Not
-       enabled by default because it is resource intensive.
-      </para>
-     </listitem>
-    </varlistentry>
    </variablelist>
 
    Tests for features that are not supported by the current build
diff --git a/src/test/recovery/Makefile b/src/test/recovery/Makefile
index ec5a1f14d1..e3011c3e37 100644
--- a/src/test/recovery/Makefile
+++ b/src/test/recovery/Makefile
@@ -15,14 +15,10 @@ subdir = src/test/recovery
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-# required for 017_shm.pl and 027_stream_regress.pl
+# required for 017_shm.pl
 REGRESS_SHLIB=$(abs_top_builddir)/src/test/regress/regress$(DLSUFFIX)
 export REGRESS_SHLIB
 
-# required for 027_stream_regress.pl
-REGRESS_OUTPUTDIR=$(abs_top_builddir)/src/test/recovery
-export REGRESS_OUTPUTDIR
-
 check:
 	$(prove_check)
 
diff --git a/src/test/recovery/t/027_stream_regress.pl b/src/test/recovery/t/027_stream_regress.pl
deleted file mode 100644
index afd2d2242a..0000000000
--- a/src/test/recovery/t/027_stream_regress.pl
+++ /dev/null
@@ -1,80 +0,0 @@
-# Run the standard regression tests with streaming replication
-use strict;
-use warnings;
-use PostgreSQL::Test::Cluster;
-use PostgreSQL::Test::Utils;
-use Test::More tests => 4;
-use File::Basename;
-
-# Initialize primary node
-my $node_primary = PostgreSQL::Test::Cluster->new('primary');
-$node_primary->init(allows_streaming => 1);
-$node_primary->adjust_conf('postgresql.conf', 'max_connections', '25', 1);
-$node_primary->append_conf('postgresql.conf', 'max_prepared_transactions = 10');
-
-# WAL consistency checking is resource intensive so require opt-in with the
-# PG_TEST_EXTRA environment variable.
-if ($ENV{PG_TEST_EXTRA} &&
-	$ENV{PG_TEST_EXTRA} =~ m/\bwal_consistency_checking\b/) {
-	$node_primary->append_conf('postgresql.conf',
-		'wal_consistency_checking = all');
-}
-
-$node_primary->start;
-is( $node_primary->psql(
-        'postgres',
-        qq[SELECT pg_create_physical_replication_slot('standby_1');]),
-    0,
-    'physical slot created on primary');
-my $backup_name = 'my_backup';
-
-# Take backup
-$node_primary->backup($backup_name);
-
-# Create streaming standby linking to primary
-my $node_standby_1 = PostgreSQL::Test::Cluster->new('standby_1');
-$node_standby_1->init_from_backup($node_primary, $backup_name,
-	has_streaming => 1);
-$node_standby_1->append_conf('postgresql.conf',
-    "primary_slot_name = standby_1");
-$node_standby_1->start;
-
-my $dlpath = PostgreSQL::Test::Utils::perl2host(dirname($ENV{REGRESS_SHLIB}));
-my $outputdir = PostgreSQL::Test::Utils::perl2host($ENV{REGRESS_OUTPUTDIR});
-
-# Run the regression tests against the primary.
-my $extra_opts = $ENV{EXTRA_REGRESS_OPTS} || "";
-system_or_bail($ENV{PG_REGRESS} . " " .
-			   "--dlpath=\"$dlpath\" " .
-			   "--bindir= " .
-			   "--port=" . $node_primary->port . " " .
-			   "--schedule=../regress/parallel_schedule " .
-			   "--max-concurrent-tests=20 " .
-			   "--inputdir=../regress " .
-			   "--outputdir=\"$outputdir\" " .
-			   $extra_opts);
-
-# Clobber all sequences with their next value, so that we don't have
-# differences between nodes due to caching.
-$node_primary->psql('regression',
-	"select setval(seqrelid, nextval(seqrelid)) from pg_sequence");
-
-# Wait for standby to catch up
-$node_primary->wait_for_catchup($node_standby_1, 'replay',
-	$node_primary->lsn('insert'));
-
-# Perform a logical dump of primary and standby, and check that they match
-command_ok(
-	[ 'pg_dumpall', '-f', $outputdir . '/primary.dump', '--no-sync',
-	  '-p', $node_primary->port ],
-	'dump primary server');
-command_ok(
-	[ 'pg_dumpall', '-f', $outputdir . '/standby.dump', '--no-sync',
-	  '-p', $node_standby_1->port ],
-	'dump standby server');
-command_ok(
-	[ 'diff', $outputdir . '/primary.dump', $outputdir . '/standby.dump' ],
-	'compare primary and standby dumps');
-
-$node_standby_1->stop;
-$node_primary->stop;
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 8ba823b712..7c4115614e 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -536,8 +536,6 @@ sub recoverycheck
 {
 	InstallTemp();
 
-	$ENV{REGRESS_OUTPUTDIR} = "$topdir/src/test/recovery";
-
 	my $mstat  = 0;
 	my $dir    = "$topdir/src/test/recovery";
 	my $status = tap_check($dir);