fix isolation2

Author: liushengsong

src/bin/pg_basebackup/bbstreamer_file.c

@@ -323,12 +323,15 @@ extract_directory(const char *filename, mode_t mode)
 		 * pg_xlog we assume is deleted at the start of
 		 * pg_basebackup. We cannot delete pg_xlog because if
 		 * streammode was used then it may have already copied
-		 * new xlog files into pg_xlog directory.
+		 * new xlog files into pg_xlog directory. Similarly,
+		 * archive_status may have .done files created by the
+		 * WAL streamer child process via mark_file_as_archived().
 		 */
 		if (pg_str_endswith(filename, "/pg_log") ||
 			pg_str_endswith(filename, "/log") ||
 			pg_str_endswith(filename, "/pg_wal") ||
-			pg_str_endswith(filename, "/pg_xlog"))
+			pg_str_endswith(filename, "/pg_xlog") ||
+			pg_str_endswith(filename, "/archive_status"))
 			return;
 
 		rmtree(filename, true);

src/test/isolation2/Makefile

@@ -29,7 +29,7 @@ test_parallel_retrieve_cursor_extended_query_error: test_parallel_retrieve_curso
 	$(CC) $(CPPFLAGS) $(rpath) -I$(top_builddir)/src/interfaces/libpq -L$(GPHOME)/lib -L$(top_builddir)/src/interfaces/libpq  -o $@ $< -lpq
 
 pg_regress.o:
-	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o
+	$(MAKE) -C $(top_builddir)/src/test/regress install
 	rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
 
 gpstringsubs.pl:

src/test/isolation2/expected/bitmap_index_crash.out

@@ -111,7 +111,7 @@ select count(*) from test_bitmap where type = 520;
 (1 row)
 
 -- start_ignore
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
 
 0: select count(*) from test_bitmap where type = 520;

src/test/isolation2/expected/instr_in_shmem_setup.out

@@ -1,3 +1,3 @@
 -- start_ignore
-! gpconfig -c gp_enable_query_metrics -v on; ! gpstop -rai;
+! gpconfig -c gp_enable_query_metrics -v on; ! gpstop -raf;
 -- end_ignore

src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v1.out

@@ -27,7 +27,7 @@ ERROR:  language "plpython3u" already exists
 
 ! gpconfig -c runaway_detector_activation_percent -v 100;
 
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
 
 -- after the restart we need a new connection to run the queries

src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out

@@ -27,7 +27,7 @@ ERROR:  language "plpython3u" already exists
 
 ! gpconfig -c runaway_detector_activation_percent -v 100;
 
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
 
 -- after the restart we need a new connection to run the queries

src/test/isolation2/expected/resgroup/resgroup_cpuset_empty_default.out

@@ -30,7 +30,7 @@ ALTER RESOURCE GROUP
 
 
 -- start_ignore
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
 
 -- Cleanup in a new connection as the default one is disconnected by gpstop

src/test/isolation2/expected/resgroup/resgroup_disable_resgroup.out

@@ -2,7 +2,7 @@
 -- start_ignore
 ! gpconfig -r gp_resource_manager;
 
-! gpstop -rai;
+! gpstop -ra;
 
 SHOW gp_resource_manager;
  gp_resource_manager 

src/test/isolation2/sql/instr_in_shmem_setup.sql

@@ -1,4 +1,4 @@
 -- start_ignore
 ! gpconfig -c gp_enable_query_metrics -v on; 
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore

src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v1.sql

@@ -23,7 +23,7 @@ CREATE LANGUAGE plpython3u;
 ! gpconfig -c gp_resource_manager -v group;
 ! gpconfig -c max_connections -v 250 -m 25;
 ! gpconfig -c runaway_detector_activation_percent -v 100;
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
 
 -- after the restart we need a new connection to run the queries