From dab43830af019896ef1811aeeeb5d1e4e2bcccea Mon Sep 17 00:00:00 2001 From: Andy Fan Date: Thu, 3 Jul 2025 13:04:02 +0000 Subject: [PATCH v3 1/1] Avoid activating commit_ts while bootstrap. TransactionIdSetCommitTs had an Assert failure when initdb with track_commit_timestamp=on before this commit because it thought all the provided xids are normal xid. So avoiding the activating commit_ts in bootstrap mode could fix this issue. Test case is also enhanced to discover this issue. Author: Hayato Kuroda Author: Andy Fan Reviewed-by: Michael Paquier Reviewed-by: Bertrand Drouvot Reviewed-by: Fujii Masao Discussion: https://postgr.es/m/OSCPR01MB14966FF9E4C4145F37B937E52F5102@OSCPR01MB14966.jpnprd01.prod.outlook.com Discussion: https://postgr.es/m/87plejmnpy.fsf%40163.com --- src/backend/access/transam/commit_ts.c | 7 +++++++ src/test/modules/commit_ts/t/001_base.pl | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index 113fae1437a..15078698cf9 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -707,6 +707,13 @@ ActivateCommitTs(void) TransactionId xid; int64 pageno; + /* + * commit_ts assumes that we are not in the bootstrap mode: skip the + * activation. + */ + if (IsBootstrapProcessingMode()) + return; + /* If we've done this already, there's nothing to do */ LWLockAcquire(CommitTsLock, LW_EXCLUSIVE); if (commitTsShared->commitTsActive) diff --git a/src/test/modules/commit_ts/t/001_base.pl b/src/test/modules/commit_ts/t/001_base.pl index 1953b18f6b3..91983fc5179 100644 --- a/src/test/modules/commit_ts/t/001_base.pl +++ b/src/test/modules/commit_ts/t/001_base.pl @@ -11,7 +11,7 @@ use Test::More; use PostgreSQL::Test::Cluster; my $node = PostgreSQL::Test::Cluster->new('foxtrot'); -$node->init; +$node->init(extra => ['-c', "track_commit_timestamp=on"]); $node->append_conf('postgresql.conf', 'track_commit_timestamp = on'); $node->start; -- 2.45.1