This is an automated email from the ASF dual-hosted git repository. tuhaihe pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 177f3a59f1467c63da7d135332b66b59ffc635d8 Author: liushengsong <[email protected]> AuthorDate: Mon Jun 22 10:14:07 2026 +0800 Re-enable select_throttle and workfile_mgr_test in singlenode Re-enable segwalrep/select_throttle in isolation2_schedule and workfile_mgr_test in singlenode. Fix gpstop -ari to -arf for singlenode mode where immediate shutdown causes crash recovery and blocks connections. --- src/test/isolation2/isolation2_schedule | 3 +-- src/test/singlenode_isolation2/input/workfile_mgr_test.source | 4 ++-- src/test/singlenode_isolation2/isolation2_schedule | 3 +-- src/test/singlenode_isolation2/output/workfile_mgr_test.source | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/test/isolation2/isolation2_schedule b/src/test/isolation2/isolation2_schedule index 7e7e4220d12..82d23731fb6 100644 --- a/src/test/isolation2/isolation2_schedule +++ b/src/test/isolation2/isolation2_schedule @@ -253,8 +253,7 @@ test: segwalrep/dtm_recovery_on_standby test: segwalrep/commit_blocking_on_standby test: segwalrep/dtx_recovery_wait_lsn -# MERGE16_FIXME: enable this case latter -# test: segwalrep/select_throttle +test: segwalrep/select_throttle test: segwalrep/startup_rename_prepared_xlog test: fts_manual_probe test: fts_session_reset diff --git a/src/test/singlenode_isolation2/input/workfile_mgr_test.source b/src/test/singlenode_isolation2/input/workfile_mgr_test.source index 30f03315d7e..f5e189e694b 100644 --- a/src/test/singlenode_isolation2/input/workfile_mgr_test.source +++ b/src/test/singlenode_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/singlenode_isolation2/isolation2_schedule b/src/test/singlenode_isolation2/isolation2_schedule index adf4e6c0ede..7e5266d1c84 100644 --- a/src/test/singlenode_isolation2/isolation2_schedule +++ b/src/test/singlenode_isolation2/isolation2_schedule @@ -211,8 +211,7 @@ test: uao/bitmapindex_rescan_column # test: add_column_after_vacuum_skip_drop_column # test: vacuum_after_vacuum_skip_drop_column # test workfile_mgr -# MERGE16_FIXME: enable workfile_mgr_test later -#test: workfile_mgr_test +test: workfile_mgr_test # test: pg_basebackup # test: pg_basebackup_with_tablespaces test: enable_autovacuum diff --git a/src/test/singlenode_isolation2/output/workfile_mgr_test.source b/src/test/singlenode_isolation2/output/workfile_mgr_test.source index a6821ecc38b..5fcbd06dde4 100644 --- a/src/test/singlenode_isolation2/output/workfile_mgr_test.source +++ b/src/test/singlenode_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... @@ -122,7 +122,7 @@ DROP -- end_ignore (exited with code 0) -!\retcode gpstop -ari; +!\retcode gpstop -arf; -- start_ignore 20230630:09:01:15:025313 gpstop:merge:gpadmin-[INFO]:-Starting gpstop with args: -ari 20230630:09:01:15:025313 gpstop:merge:gpadmin-[INFO]:-Gathering information and validating the environment... --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
