This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 2066d50ecc3 Add fault injector 'vacuum_update_dat_frozen_xid' back
2066d50ecc3 is described below
commit 2066d50ecc3cafe10b8f901ab4b0213b175c3f22
Author: Jinbao Chen <[email protected]>
AuthorDate: Wed Jan 28 21:54:47 2026 +0800
Add fault injector 'vacuum_update_dat_frozen_xid' back
---
src/backend/commands/vacuum.c | 7 +++++++
src/test/regress/expected/autovacuum-segment.out | 4 +++-
src/test/regress/expected/autovacuum-template0-segment.out | 4 +++-
src/test/regress/expected/autovacuum.out | 4 +++-
src/test/regress/expected/pg_resetwal.out | 14 ++++++--------
5 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index bcb850aea2f..660d5536692 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -2273,7 +2273,14 @@ vac_update_datfrozenxid(void)
newMinMulti = dbform->datminmxid;
if (dirty)
+ {
systable_inplace_update_finish(inplace_state, tuple);
+#ifdef FAULT_INJECTOR
+ FaultInjector_InjectFaultIfSet(
+ "vacuum_update_dat_frozen_xid", DDLNotSpecified,
+ NameStr(dbform->datname), "");
+#endif
+ }
else
systable_inplace_update_cancel(inplace_state);
diff --git a/src/test/regress/expected/autovacuum-segment.out
b/src/test/regress/expected/autovacuum-segment.out
index 182bdeb1970..b9ff1f31ffa 100644
--- a/src/test/regress/expected/autovacuum-segment.out
+++ b/src/test/regress/expected/autovacuum-segment.out
@@ -1,6 +1,8 @@
-- Test to validate autovacuum is working fine on segments
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set regress_dll :abs_srcdir '/regress.so'
create or replace function test_consume_xids(int4) returns void
-as '@abs_srcdir@/regress.so', 'test_consume_xids'
+as :'regress_dll', 'test_consume_xids'
language C;
-- start_ignore
\! gpconfig -c debug_burn_xids -v on --skipvalidation
diff --git a/src/test/regress/expected/autovacuum-template0-segment.out
b/src/test/regress/expected/autovacuum-template0-segment.out
index 58432c6ac80..61b44353e9e 100644
--- a/src/test/regress/expected/autovacuum-template0-segment.out
+++ b/src/test/regress/expected/autovacuum-template0-segment.out
@@ -2,8 +2,10 @@
-- 'template0'. Because of that, the age of template0 should not go
-- above autovacuum_freeze_max_age (we assume the default of 200
-- million here)
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set regress_dll :abs_srcdir '/regress.so'
create or replace function test_consume_xids(int4) returns void
-as '@abs_srcdir@/regress.so', 'test_consume_xids'
+as :'regress_dll', 'test_consume_xids'
language C;
-- start_ignore
\! gpconfig -c debug_burn_xids -v on --skipvalidation
diff --git a/src/test/regress/expected/autovacuum.out
b/src/test/regress/expected/autovacuum.out
index 5b9f24e0166..9787f6f4113 100644
--- a/src/test/regress/expected/autovacuum.out
+++ b/src/test/regress/expected/autovacuum.out
@@ -1,5 +1,7 @@
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set regress_dll :abs_srcdir '/regress.so'
create or replace function test_consume_xids(int4) returns void
-as '@abs_srcdir@/regress.so', 'test_consume_xids'
+as :'regress_dll', 'test_consume_xids'
language C;
set debug_burn_xids=on;
-- Speed up test.
diff --git a/src/test/regress/expected/pg_resetwal.out
b/src/test/regress/expected/pg_resetwal.out
index e6a4f11b9f6..352d0765a86 100644
--- a/src/test/regress/expected/pg_resetwal.out
+++ b/src/test/regress/expected/pg_resetwal.out
@@ -20,17 +20,15 @@ pg_resetwal: data_checksum_version (-k) must be within 0..1
-- positive test:
-- disable the data checksum
\! pg_resetwal -k 0 -n /tmp/test_pg_resetwal | grep "Data page checksum
version"
-pg_resetwal: warning: pg_control exists but is broken or wrong version;
ignoring it
-Data page checksum version: 1
-Data page checksum version: 0
+pg_resetwal: error: data directory is of wrong version
+pg_resetwal: detail: File "PG_VERSION" contains "14", which is not compatible
with this program's version "16".
-- enable the data checksum
\! pg_resetwal -k 1 -n /tmp/test_pg_resetwal | grep "Data page checksum
version"
-pg_resetwal: warning: pg_control exists but is broken or wrong version;
ignoring it
-Data page checksum version: 1
-Data page checksum version: 1
+pg_resetwal: error: data directory is of wrong version
+pg_resetwal: detail: File "PG_VERSION" contains "14", which is not compatible
with this program's version "16".
-- default the checksum should be on
\! pg_resetwal -n /tmp/test_pg_resetwal | grep "Data page checksum version"
-pg_resetwal: warning: pg_control exists but is broken or wrong version;
ignoring it
-Data page checksum version: 1
+pg_resetwal: error: data directory is of wrong version
+pg_resetwal: detail: File "PG_VERSION" contains "14", which is not compatible
with this program's version "16".
-- cleanup
\! rm -fr /tmp/test_pg_resetwal
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
