You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by dj...@apache.org on 2026/06/25 07:15:37 UTC
(cloudberry) 08/12: Fix singlenode prevent_ao_wal test: enable pg_waldump and fix expected output
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 98d659121ec0c5a17b6508df4440495838507b65
Author: liushengsong <ls...@gmail.com>
AuthorDate: Mon Jun 22 10:13:59 2026 +0800
Fix singlenode prevent_ao_wal test: enable pg_waldump and fix expected output
Enable pg_waldump validation in singlenode prevent_ao_wal test (was
disabled by MERGE16_FIXME). Broaden matchignore to handle both "fatal"
and "error" messages from pg_waldump. Add missing blank lines in
expected output after pg_waldump command output.
---
.../expected/prevent_ao_wal.out | 47 ++++++++++------------
.../singlenode_isolation2/sql/prevent_ao_wal.sql | 7 +---
2 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/src/test/singlenode_isolation2/expected/prevent_ao_wal.out b/src/test/singlenode_isolation2/expected/prevent_ao_wal.out
index fb5f556ce91..be069bcee39 100644
--- a/src/test/singlenode_isolation2/expected/prevent_ao_wal.out
+++ b/src/test/singlenode_isolation2/expected/prevent_ao_wal.out
@@ -15,7 +15,7 @@
GP_IGNORE: formatted by atmsort.pm
-- start_matchignore
--- m/pg_waldump: fatal: error in WAL record at */
+-- m/pg_waldump: (fatal|error): .*/
-- m/.*The 'DISTRIBUTED BY' clause determines the distribution of data*/
-- m/.*Table doesn't have 'DISTRIBUTED BY' clause*/
-- end_matchignore
@@ -64,31 +64,28 @@ VACUUM
-1Uq: ... <quitting>
-- Validate wal records
--- MERGE16_FIXME: this should throw a 'pg_waldump: error: error in WAL record at 0/40247EF8: invalid record length at 0/40247F28: expected at least 24, got 0' ERROR, fix it later
--- start_ignore
! last_wal_file=$(psql -At -c "SELECT pg_walfile_name(pg_current_wal_lsn())" postgres) && pg_waldump ${last_wal_file} -p ${COORDINATOR_DATA_DIRECTORY}/pg_wal -r appendonly;
-rmgr: Appendonly len (rec/tot): 186/ 186, tx: 12661, lsn: 0/F8000178, prev 0/F8000128, desc: APPENDONLY_INSERT insert: rel 1663/221728/180472 seg/offset:0/0 len:136
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 12662, lsn: 0/F8000400, prev 0/F80003C0, desc: APPENDONLY_INSERT insert: rel 1663/221728/180476 seg/offset:128/0 len:0
-rmgr: Appendonly len (rec/tot): 130/ 130, tx: 12662, lsn: 0/F8000490, prev 0/F8000440, desc: APPENDONLY_INSERT insert: rel 1663/221728/180476 seg/offset:0/0 len:80
-rmgr: Appendonly len (rec/tot): 130/ 130, tx: 12662, lsn: 0/F8000520, prev 0/F8000490, desc: APPENDONLY_INSERT insert: rel 1663/221728/180476 seg/offset:128/0 len:80
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 0, lsn: 0/F8000840, prev 0/F8000810, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180472 seg/offset:0/136
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 12664, lsn: 0/F8000A18, prev 0/F80009D8, desc: APPENDONLY_INSERT insert: rel 1663/221728/180472 seg/offset:1/0 len:0
-rmgr: Appendonly len (rec/tot): 138/ 138, tx: 12664, lsn: 0/F8000B38, prev 0/F8000AF8, desc: APPENDONLY_INSERT insert: rel 1663/221728/180472 seg/offset:1/0 len:88
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 12665, lsn: 0/F8000C98, prev 0/F8000C68, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180472 seg/offset:0/0
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 0, lsn: 0/F80412F8, prev 0/F80412C8, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:0/80
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 0, lsn: 0/F8041338, prev 0/F80412F8, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:128/80
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 0, lsn: 0/F8307118, prev 0/F83070E8, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180472 seg/offset:1/88
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 0, lsn: 0/F8307150, prev 0/F8307118, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180472 seg/offset:0/0
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 0, lsn: 0/F8307208, prev 0/F83071D8, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:0/80
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 0, lsn: 0/F8307248, prev 0/F8307208, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:128/80
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 12673, lsn: 0/F8307440, prev 0/F8307400, desc: APPENDONLY_INSERT insert: rel 1663/221728/180476 seg/offset:1/0 len:0
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 12673, lsn: 0/F8307480, prev 0/F8307440, desc: APPENDONLY_INSERT insert: rel 1663/221728/180476 seg/offset:129/0 len:0
-rmgr: Appendonly len (rec/tot): 114/ 114, tx: 12673, lsn: 0/F83075A0, prev 0/F8307560, desc: APPENDONLY_INSERT insert: rel 1663/221728/180476 seg/offset:1/0 len:64
-rmgr: Appendonly len (rec/tot): 114/ 114, tx: 12673, lsn: 0/F8307620, prev 0/F83075A0, desc: APPENDONLY_INSERT insert: rel 1663/221728/180476 seg/offset:129/0 len:64
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 12674, lsn: 0/F8307780, prev 0/F8307750, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:0/0
-rmgr: Appendonly len (rec/tot): 50/ 50, tx: 12674, lsn: 0/F83077C0, prev 0/F8307780, desc: APPENDONLY_TRUNCATE truncate: rel 1663/221728/180476 seg/offset:128/0
+rmgr: Appendonly len (rec/tot): 186/ 186, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:0/0 len:136
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:128/0 len:0
+rmgr: Appendonly len (rec/tot): 130/ 130, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:0/0 len:80
+rmgr: Appendonly len (rec/tot): 130/ 130, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:128/0 len:80
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:0/136
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:1/0 len:0
+rmgr: Appendonly len (rec/tot): 138/ 138, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:1/0 len:88
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:0/0
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:0/80
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:128/80
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:1/88
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:0/0
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:0/80
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:128/80
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:1/0 len:0
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:129/0 len:0
+rmgr: Appendonly len (rec/tot): 114/ 114, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:1/0 len:64
+rmgr: Appendonly len (rec/tot): 114/ 114, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_INSERT insert: rel ####/######/###### seg/offset:129/0 len:64
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:0/0
+rmgr: Appendonly len (rec/tot): 50/ 50, tx: ##, lsn: #/########, prev #/########, desc: APPENDONLY_TRUNCATE truncate: rel ####/######/###### seg/offset:128/0
--- end_ignore
-- *********** Set wal_level=minimal **************
!\retcode gpconfig -c wal_level -v minimal --masteronly;
@@ -124,10 +121,8 @@ DELETE 5
VACUUM
-- Validate wal records
--- start_ignore
! last_wal_file=$(psql -At -c "SELECT pg_walfile_name(pg_current_wal_lsn())" postgres) && pg_waldump ${last_wal_file} -p ${COORDINATOR_DATA_DIRECTORY}/pg_wal -r appendonly;
--- end_ignore
-1U: DROP TABLE ao_foo;
DROP
diff --git a/src/test/singlenode_isolation2/sql/prevent_ao_wal.sql b/src/test/singlenode_isolation2/sql/prevent_ao_wal.sql
index 06b64591658..c9a32051f18 100644
--- a/src/test/singlenode_isolation2/sql/prevent_ao_wal.sql
+++ b/src/test/singlenode_isolation2/sql/prevent_ao_wal.sql
@@ -14,7 +14,7 @@
-- validate WAL records on the coordinator.
-- start_matchignore
--- m/pg_waldump: fatal: error in WAL record at */
+-- m/pg_waldump: (fatal|error): .*/
-- m/.*The 'DISTRIBUTED BY' clause determines the distribution of data*/
-- m/.*Table doesn't have 'DISTRIBUTED BY' clause*/
-- end_matchignore
@@ -49,10 +49,7 @@
-1Uq:
-- Validate wal records
--- MERGE16_FIXME: this should throw a 'pg_waldump: error: error in WAL record at 0/40247EF8: invalid record length at 0/40247F28: expected at least 24, got 0' ERROR, fix it later
--- start_ignore
! last_wal_file=$(psql -At -c "SELECT pg_walfile_name(pg_current_wal_lsn())" postgres) && pg_waldump ${last_wal_file} -p ${COORDINATOR_DATA_DIRECTORY}/pg_wal -r appendonly;
--- end_ignore
-- *********** Set wal_level=minimal **************
!\retcode gpconfig -c wal_level -v minimal --masteronly;
@@ -75,9 +72,7 @@
-1U: VACUUM;
-- Validate wal records
--- start_ignore
! last_wal_file=$(psql -At -c "SELECT pg_walfile_name(pg_current_wal_lsn())" postgres) && pg_waldump ${last_wal_file} -p ${COORDINATOR_DATA_DIRECTORY}/pg_wal -r appendonly;
--- end_ignore
-1U: DROP TABLE ao_foo;
-1U: DROP TABLE aoco_foo;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org