fix isolation2

liushengsong · liushengsong · commit fa958ab8129e · 2026-03-18T15:42:55.000+08:00
diff --git a/src/test/isolation2/Makefile b/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:
diff --git a/src/test/isolation2/expected/bitmap_index_crash.out b/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;
diff --git a/src/test/isolation2/expected/instr_in_shmem_setup.out b/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
diff --git a/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v1.out b/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
diff --git a/src/test/isolation2/expected/resgroup/resgroup_auxiliary_tools_v2.out b/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
diff --git a/src/test/isolation2/expected/resgroup/resgroup_cpuset_empty_default.out b/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
diff --git a/src/test/isolation2/expected/resgroup/resgroup_disable_resgroup.out b/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 
diff --git a/src/test/isolation2/input/pg_basebackup.source b/src/test/isolation2/input/pg_basebackup.source
@@ -1,3 +1,8 @@
+-- start_matchsubs
+-- m/pg_basebackup: warning:.*/
+-- s/pg_basebackup: warning:.*//
+-- end_matchsubs
+
 -- When pg_basebackup runs with --slot and stream as wal-method
 select pg_basebackup(address, dbid, port, true, 'some_replication_slot', '@testtablespace@/some_isolation2_pg_basebackup', false, 'stream') from gp_segment_configuration where content = 0 and role = 'p';
 
diff --git a/src/test/isolation2/output/pg_basebackup.source b/src/test/isolation2/output/pg_basebackup.source
@@ -1,3 +1,8 @@
+-- start_matchsubs
+-- m/pg_basebackup: warning:.*/
+-- s/pg_basebackup: warning:.*//
+-- end_matchsubs
+
 -- When pg_basebackup runs with --slot and stream as wal-method
 select pg_basebackup(address, dbid, port, true, 'some_replication_slot', '@testtablespace@/some_isolation2_pg_basebackup', false, 'stream') from gp_segment_configuration where content = 0 and role = 'p';
  pg_basebackup 
diff --git a/src/test/isolation2/sql/instr_in_shmem_setup.sql b/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
diff --git a/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v1.sql b/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
diff --git a/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql b/src/test/isolation2/sql/resgroup/resgroup_auxiliary_tools_v2.sql
@@ -23,7 +23,7 @@ CREATE LANGUAGE plpython3u;
 ! gpconfig -c gp_resource_manager -v group-v2;
 ! 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
diff --git a/src/test/isolation2/sql/resgroup/resgroup_cpuset_empty_default.sql b/src/test/isolation2/sql/resgroup/resgroup_cpuset_empty_default.sql
@@ -25,7 +25,7 @@ ALTER RESOURCE GROUP rg1_cpuset_test SET cpuset '0';
 ! psql -d isolation2resgrouptest -Ac "ALTER RESOURCE GROUP rg1_cpuset_test SET cpuset '0-$(($(nproc)-1))'";
 
 -- start_ignore
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
 
 -- Cleanup in a new connection as the default one is disconnected by gpstop
diff --git a/src/test/isolation2/sql/restore_memory_accounting_default.sql b/src/test/isolation2/sql/restore_memory_accounting_default.sql
@@ -2,5 +2,5 @@
 ! gpconfig -c gp_vmem_limit_per_query -v '0' --skipvalidation
 ! gpconfig -c gp_vmem_protect_limit -v '8192'
 ! gpconfig -c runaway_detector_activation_percent -v 0
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
diff --git a/src/test/isolation2/sql/setup_memory_accounting.sql b/src/test/isolation2/sql/setup_memory_accounting.sql
@@ -2,5 +2,5 @@
 ! gpconfig -c gp_vmem_limit_per_query -v '2MB' --skipvalidation
 ! gpconfig -c gp_vmem_protect_limit -v '20'
 ! gpconfig -c runaway_detector_activation_percent -v 0
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
diff --git a/src/test/isolation2/sql/setup_startup_memory_accounting.sql b/src/test/isolation2/sql/setup_startup_memory_accounting.sql
@@ -2,5 +2,5 @@
 ! gpconfig -c gp_vmem_limit_per_query -v '20MB' --skipvalidation
 ! gpconfig -c gp_vmem_protect_limit -v '60'
 ! gpconfig -c runaway_detector_activation_percent -v 0
-! gpstop -rai;
+! gpstop -raf;
 -- end_ignore
diff --git a/src/test/regress/expected/gp_connections.out b/src/test/regress/expected/gp_connections.out
@@ -1,6 +1,25 @@
 --
 -- GPDB internal connection tests
 --
+--
+-- Segment connection tests
+--
+-- We should not be able to directly connect to a primary segment.
+-- Use dblink to test, so a connection failure does not cause psql to exit.
+-- start_ignore
+CREATE EXTENSION IF NOT EXISTS dblink;
+-- end_ignore
+SELECT dblink_connect('seg_test',
+    'host=localhost port=' || port || ' dbname=postgres')
+    FROM gp_segment_configuration
+    WHERE content <> -1 AND role = 'p' LIMIT 1;
+ERROR:  could not establish connection
+DETAIL:  connection to server at "localhost" (::1), port 7002 failed: FATAL:  connections to primary segments are not allowed
+DETAIL:  This database instance is running as a primary segment in a Cloudberry cluster and does not permit direct connections.
+HINT:  To force a connection anyway (dangerous!), use utility mode.
+--
+-- Internal connection tests
+--
 -- create a new user
 drop user if exists user_disallowed_via_local;
 create user user_disallowed_via_local with login;
@@ -37,16 +56,3 @@ select * from t1_of_user_disallowed_via_local, pg_sleep(0);
 
 -- cleanup settings if any
 \! sed -i '/user_disallowed_via_local/d' $COORDINATOR_DATA_DIRECTORY/pg_hba.conf;
---
--- Segment connection tests
---
--- We should not be able to directly connect to a primary segment.
--- start_ignore
-SELECT port FROM gp_segment_configuration
-			WHERE content <> -1 AND role = 'p'
-			LIMIT 1
-\gset
-ERROR:  permission denied for view gp_segment_configuration
-\connect - - - :port
-\connect: invalid integer value ":port" for connection option "port"
--- end_ignore
diff --git a/src/test/regress/sql/gp_connections.sql b/src/test/regress/sql/gp_connections.sql
@@ -2,6 +2,24 @@
 -- GPDB internal connection tests
 --
 
+--
+-- Segment connection tests
+--
+
+-- We should not be able to directly connect to a primary segment.
+-- Use dblink to test, so a connection failure does not cause psql to exit.
+-- start_ignore
+CREATE EXTENSION IF NOT EXISTS dblink;
+-- end_ignore
+SELECT dblink_connect('seg_test',
+    'host=localhost port=' || port || ' dbname=postgres')
+    FROM gp_segment_configuration
+    WHERE content <> -1 AND role = 'p' LIMIT 1;
+
+--
+-- Internal connection tests
+--
+
 -- create a new user
 drop user if exists user_disallowed_via_local;
 create user user_disallowed_via_local with login;
@@ -30,18 +48,3 @@ select * from t1_of_user_disallowed_via_local, pg_sleep(0);
 
 -- cleanup settings if any
 \! sed -i '/user_disallowed_via_local/d' $COORDINATOR_DATA_DIRECTORY/pg_hba.conf;
-
---
--- Segment connection tests
---
-
--- We should not be able to directly connect to a primary segment.
--- start_ignore
-SELECT port FROM gp_segment_configuration
-			WHERE content <> -1 AND role = 'p'
-			LIMIT 1
-\gset
-\connect - - - :port
--- end_ignore
--- DON'T PUT ANYTHING BELOW THIS TEST! It'll be ignored since the above \connect
--- fails and exits the script. Add them above, instead.
