sthagen
diff --git a/‎src/backend/access/transam/commit_ts.c
Lines changed: 7 additions & 0 deletions b/‎src/backend/access/transam/commit_ts.c
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/test/modules/commit_ts/t/001_base.pl
Lines changed: 1 addition & 2 deletions b/‎src/test/modules/commit_ts/t/001_base.pl
Lines changed: 1 addition & 2 deletions
@@ -707,6 +707,13 @@ ActivateCommitTs(void)
 	TransactionId xid;
 	int64		pageno;
 
+	/*
+	 * During bootstrap, we should not register commit timestamps so skip the
+	 * activation in this case.
+	 */
+	if (IsBootstrapProcessingMode())
+		return;
+
 	/* If we've done this already, there's nothing to do */
 	LWLockAcquire(CommitTsLock, LW_EXCLUSIVE);
 	if (commitTsShared->commitTsActive)
 
@@ -11,8 +11,7 @@
 use PostgreSQL::Test::Cluster;
 
 my $node = PostgreSQL::Test::Cluster->new('foxtrot');
-$node->init;
-$node->append_conf('postgresql.conf', 'track_commit_timestamp = on');
+$node->init(extra => [ '-c', "track_commit_timestamp=on" ]);
 $node->start;
 
 # Create a table, compare "now()" to the commit TS of its xmin