From b24179efcd960c15a1fa2309bb5107c5625e33e8 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Thu, 23 Apr 2026 10:44:16 +0200 Subject: [PATCH 3/8] Handle data_checksum state changes during launcher_exit When erroring out from the datachecksums launcher during data checksum enabling, before state has transitioned to "on", we revert back to the "off" state. Since checksums weren't enabled, there is no use staying in an inprogress state since the checksum launcher currently doesn't support restarting from where it left off. Should restartability get added in the future, this would need to be revisited. This state transition was however missing from the allowed transitions in the statemachine causing an error. Author: Daniel Gustafsson Discussion: https://postgr.es/m/xxx --- src/backend/access/transam/xlog.c | 15 ++++++++------- src/backend/postmaster/datachecksum_state.c | 8 +++++++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index e39af79c03b..f74d7a2ab1a 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -4871,13 +4871,14 @@ SetDataChecksumsOff(void) } /* - * If data checksums are currently enabled we first transition to the - * "inprogress-off" state during which backends continue to write - * checksums without verifying them. When all backends are in - * "inprogress-off" the next transition to "off" can be performed, after - * which all data checksum processing is disabled. - */ - if (XLogCtl->data_checksum_version == PG_DATA_CHECKSUM_VERSION) + * If data checksums are currently enabled, or in the process of being + * enabled, we first transition to the "inprogress-off" state during which + * backends continue to write checksums without verifying them. When all + * backends are in "inprogress-off" the next transition to "off" can be + * performed, after which all data checksum processing is disabled. + */ + if (XLogCtl->data_checksum_version == PG_DATA_CHECKSUM_VERSION || + XLogCtl->data_checksum_version == PG_DATA_CHECKSUM_INPROGRESS_ON) { SpinLockRelease(&XLogCtl->info_lck); diff --git a/src/backend/postmaster/datachecksum_state.c b/src/backend/postmaster/datachecksum_state.c index ea102086144..e62a36b0af5 100644 --- a/src/backend/postmaster/datachecksum_state.c +++ b/src/backend/postmaster/datachecksum_state.c @@ -235,7 +235,7 @@ typedef struct ChecksumBarrierCondition int to; } ChecksumBarrierCondition; -static const ChecksumBarrierCondition checksum_barriers[6] = +static const ChecksumBarrierCondition checksum_barriers[7] = { /* * Disabling checksums: If checksums are currently enabled, disabling must @@ -261,6 +261,12 @@ static const ChecksumBarrierCondition checksum_barriers[6] = * checksums, we can go straight back to 'on' */ {PG_DATA_CHECKSUM_INPROGRESS_OFF, PG_DATA_CHECKSUM_VERSION}, + + /* + * If checksums are being enabled when launcher_exit is executed, state + * is set to off since we cannot reach on at that point. + */ + {PG_DATA_CHECKSUM_INPROGRESS_ON, PG_DATA_CHECKSUM_INPROGRESS_OFF}, }; /* -- 2.39.3 (Apple Git-146)