fix isolation2 use fast not intermediate mode in gpstop and pg_ctl

liushengsong · liushengsong · commit 366f3e9ec9ce · 2026-03-17T15:55:52.000+08:00
diff --git a/src/test/isolation2/expected/gdd/end.out b/src/test/isolation2/expected/gdd/end.out
@@ -6,7 +6,7 @@ ALTER
 -- Use utility session on seg 0 to restart master. This way avoids the
 -- situation where session issuing the restart doesn't disappear
 -- itself.
-1U:SELECT pg_ctl(dir, 'restart') from datadir;
+1U:SELECT pg_ctl(dir, 'restart', 'fast') from datadir;
  pg_ctl 
 --------
  OK     
diff --git a/src/test/isolation2/expected/gdd/prepare.out b/src/test/isolation2/expected/gdd/prepare.out
@@ -75,7 +75,7 @@ ALTER
 -- Use utility session on seg 0 to restart master. This way avoids the
 -- situation where session issuing the restart doesn't disappear
 -- itself.
-1U:SELECT pg_ctl(dir, 'restart') from datadir;
+1U:SELECT pg_ctl(dir, 'restart', 'fast') from datadir;
  pg_ctl 
 --------
  OK     
diff --git a/src/test/isolation2/expected/pg_rewind_fail_missing_xlog.out b/src/test/isolation2/expected/pg_rewind_fail_missing_xlog.out
@@ -19,7 +19,7 @@ INSERT 3
 
 -- end_ignore
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 (exited with code 0)
 
 -- Test 1: Ensure that pg_rewind doesn't fail due to checkpoints inadvertently
@@ -543,7 +543,7 @@ server closed the connection unexpectedly
 
 -- end_ignore
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- start_ignore
 -- end_ignore
 (exited with code 0)
@@ -663,7 +663,7 @@ DROP
 
 -- end_ignore
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- start_ignore
 -- end_ignore
 (exited with code 0)
diff --git a/src/test/isolation2/expected/prepare_limit.out b/src/test/isolation2/expected/prepare_limit.out
@@ -14,7 +14,7 @@
 -- Enable gp_autostats_mode to make sure the single value insert triger 2pc
 !\retcode gpconfig -c gp_autostats_mode -v 'on_no_stats' --skipvalidation;
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 (exited with code 0)
 
 5: create table prepare_limit1 (a int);
@@ -119,5 +119,5 @@ DROP
 (exited with code 0)
 !\retcode gpconfig -c gp_autostats_mode -v 'none' --skipvalidation;
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 (exited with code 0)
diff --git a/src/test/isolation2/expected/resgroup/resgroup_syntax.out b/src/test/isolation2/expected/resgroup/resgroup_syntax.out
@@ -563,7 +563,7 @@ DROP
 -- start_ignore
 -- end_ignore
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- start_ignore
 -- end_ignore
 (exited with code 0)
@@ -579,7 +579,7 @@ DROP
 -- start_ignore
 -- end_ignore
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- start_ignore
 -- end_ignore
 (exited with code 0)
diff --git a/src/test/isolation2/init_file_isolation2 b/src/test/isolation2/init_file_isolation2
@@ -47,8 +47,8 @@ m/.*Process \d+ waits for ExclusiveLock on resource queue \d+; blocked by proces
 s/.*Process \d+ waits for ExclusiveLock on resource queue \d+; blocked by process \d+./Process PID waits for ExclusiveLock on resource queue OID; blocked by process PID./
 
 # For resource queue self-deadlock detail
-m/resource queue id: \d+, portal id: \d+/
-s/resource queue id: \d+, portal id: \d+/resource queue id: OID, portal id: NUM/
+m/resource queue id: (\d+|XXXX), portal id: \d+/
+s/resource queue id: (\d+|XXXX), portal id: \d+/resource queue id: OID, portal id: NUM/
 
 m/^Process \d+ waits for ShareLock on transaction \d+; blocked by process \d+./
 s/^Process \d+ waits for ShareLock on transaction \d+; blocked by process \d+./Process PID waits for ShareLock on transaction XID; blocked by process PID./
diff --git a/src/test/isolation2/input/workfile_mgr_test.source b/src/test/isolation2/input/workfile_mgr_test.source
@@ -57,7 +57,7 @@ language plpgsql volatile execute on all segments;
 
 -- start_ignore
 !\retcode gpconfig -c gp_workfile_max_entries -v 32 --skipvalidation;
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- end_ignore
 
 -- setup for workfile made in temp tablespace test
@@ -80,7 +80,7 @@ language plpgsql volatile execute on all segments;
 
 -- start_ignore
 !\retcode gpconfig -r gp_workfile_max_entries --skipvalidation;
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- end_ignore
 
 -- test workset cleanup
diff --git a/src/test/isolation2/output/workfile_mgr_test.source b/src/test/isolation2/output/workfile_mgr_test.source
@@ -30,7 +30,7 @@ CREATE
 
 -- end_ignore
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- start_ignore
 20200923:12:05:57:014232 gpstop:mdw:gpadmin-[INFO]:-Starting gpstop with args: -ari
 20200923:12:05:57:014232 gpstop:mdw:gpadmin-[INFO]:-Gathering information and validating the environment...
@@ -132,7 +132,7 @@ DROP
 
 -- end_ignore
 (exited with code 0)
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- start_ignore
 20200923:12:08:05:016154 gpstop:mdw:gpadmin-[INFO]:-Starting gpstop with args: -ari
 20200923:12:08:05:016154 gpstop:mdw:gpadmin-[INFO]:-Gathering information and validating the environment...
diff --git a/src/test/isolation2/sql/bitmap_index_crash.sql b/src/test/isolation2/sql/bitmap_index_crash.sql
@@ -49,7 +49,7 @@ create index on test_bitmap using bitmap(type);
 select count(*) from test_bitmap where type = 520;
 
 -- start_ignore
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
 
 0: select count(*) from test_bitmap where type = 520;
diff --git a/src/test/isolation2/sql/gdd/end.sql b/src/test/isolation2/sql/gdd/end.sql
@@ -4,7 +4,7 @@ ALTER SYSTEM RESET gp_global_deadlock_detector_period;
 -- Use utility session on seg 0 to restart master. This way avoids the
 -- situation where session issuing the restart doesn't disappear
 -- itself.
-1U:SELECT pg_ctl(dir, 'restart') from datadir;
+1U:SELECT pg_ctl(dir, 'restart', 'fast') from datadir;
 -- Start new session on master to make sure it has fully completed
 -- recovery and up and running again.
 1: SHOW gp_enable_global_deadlock_detector;
diff --git a/src/test/isolation2/sql/gdd/prepare.sql b/src/test/isolation2/sql/gdd/prepare.sql
@@ -59,7 +59,7 @@ ALTER SYSTEM SET gp_global_deadlock_detector_period TO 5;
 -- Use utility session on seg 0 to restart master. This way avoids the
 -- situation where session issuing the restart doesn't disappear
 -- itself.
-1U:SELECT pg_ctl(dir, 'restart') from datadir;
+1U:SELECT pg_ctl(dir, 'restart', 'fast') from datadir;
 -- Start new session on master to make sure it has fully completed
 -- recovery and up and running again.
 1: SHOW gp_enable_global_deadlock_detector;
diff --git a/src/test/isolation2/sql/pg_rewind_fail_missing_xlog.sql b/src/test/isolation2/sql/pg_rewind_fail_missing_xlog.sql
@@ -25,7 +25,7 @@ INSERT INTO tst_missing_tbl values(2),(1),(5);
 
 -- Make the test faster by not preserving any extra wal segment files
 !\retcode gpconfig -c wal_keep_size -v 0;
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 
 -- Test 1: Ensure that pg_rewind doesn't fail due to checkpoints inadvertently
 -- recycling WAL when a former primary is marked down in configuration, while it
@@ -269,7 +269,7 @@ INSERT INTO tst_missing_tbl values(2),(1),(5);
 
 -- Turn off wal_recycle to make this test easier to write.
 !\retcode gpconfig -c wal_recycle -v false;
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 
 -- Create an unlogged table on the primary that remembers replication slot's last restart_lsn and number of WAL files.
 1U: CREATE UNLOGGED TABLE unlogged_wal_retention_test(restart_lsn_before pg_lsn, wal_count_before int);
@@ -320,4 +320,4 @@ INSERT INTO tst_missing_tbl values(2),(1),(5);
 5: DROP FUNCTION connectSeg;
 !\retcode gpconfig -r wal_keep_size;
 !\retcode gpconfig -r wal_recycle;
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
diff --git a/src/test/isolation2/sql/prepare_limit.sql b/src/test/isolation2/sql/prepare_limit.sql
@@ -8,7 +8,7 @@
 !\retcode gpconfig -c max_prepared_transactions -v 3 --skipvalidation;
 -- Enable gp_autostats_mode to make sure the single value insert triger 2pc
 !\retcode gpconfig -c gp_autostats_mode -v 'on_no_stats' --skipvalidation;
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 
 5: create table prepare_limit1 (a int);
 5: create table prepare_limit2 (a int);
@@ -62,4 +62,4 @@
 -- to 250 which is the default value when demo cluster is created.
 !\retcode gpconfig -c max_prepared_transactions -v 250 --skipvalidation;
 !\retcode gpconfig -c gp_autostats_mode -v 'none' --skipvalidation;
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
diff --git a/src/test/isolation2/sql/resgroup/resgroup_syntax.sql b/src/test/isolation2/sql/resgroup/resgroup_syntax.sql
@@ -278,13 +278,13 @@ DROP RESOURCE GROUP rg_test_group;
 -- test set cpu_max_percent to high value when gp_resource_group_cpu_limit is low
 -- start_ignore
 !\retcode gpconfig -c gp_resource_group_cpu_limit -v 0.5;
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- end_ignore
 0: CREATE RESOURCE GROUP rg_test_group WITH (cpu_max_percent=10);
 0: ALTER RESOURCE GROUP rg_test_group SET cpu_max_percent 100;
 0: DROP RESOURCE GROUP rg_test_group;
 -- start_ignore
 !\retcode gpconfig -c gp_resource_group_cpu_limit -v 1; 
-!\retcode gpstop -ari;
+!\retcode gpstop -arf;
 -- end_ignore
 
