From a0f3afbeb6d3ded067b1e776d9f122e460657770 Mon Sep 17 00:00:00 2001 From: Zhijie Hou Date: Wed, 17 Sep 2025 11:10:16 +0800 Subject: [PATCH v2] Reword recently introduced messages Three error messages recently introduced by commit 0d48d393d46 use somewhat confusing wording with as in the sense of because. In addition, one of them employed a rather obscure tense. This patch rewords both for clarity. --- src/backend/replication/logical/worker.c | 6 +++--- src/test/subscription/t/035_conflicts.pl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index 9b5885d57cf..e3520d6c80a 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -4790,7 +4790,7 @@ stop_conflict_info_retention(RetainDeadTuplesData *rdt_data) ereport(LOG, errmsg("logical replication worker for subscription \"%s\" has stopped retaining the information for detecting conflicts", MySubscription->name), - errdetail("Retention is stopped as the apply process is not advancing its xmin within the configured max_retention_duration of %u ms.", + errdetail("Retention is stopped because the apply process could not advance its xmin within the configured max_retention_duration of %u ms.", MySubscription->maxretention)); } @@ -4819,9 +4819,9 @@ resume_conflict_info_retention(RetainDeadTuplesData *rdt_data) errmsg("logical replication worker for subscription \"%s\" will resume retaining the information for detecting conflicts", MySubscription->name), MySubscription->maxretention - ? errdetail("Retention is re-enabled as the apply process is advancing its xmin within the configured max_retention_duration of %u ms.", + ? errdetail("Retention is re-enabled because the apply process can advance its xmin within the configured max_retention_duration of %u ms.", MySubscription->maxretention) - : errdetail("Retention is re-enabled as max_retention_duration is set to unlimited.")); + : errdetail("Retention is re-enabled because max_retention_duration is set to unlimited.")); /* * Restart the worker to let the launcher initialize diff --git a/src/test/subscription/t/035_conflicts.pl b/src/test/subscription/t/035_conflicts.pl index a526986c4e4..2470ef94397 100644 --- a/src/test/subscription/t/035_conflicts.pl +++ b/src/test/subscription/t/035_conflicts.pl @@ -633,7 +633,7 @@ $node_B->reload; # Confirm that the retention resumes $node_A->wait_for_log( qr/logical replication worker for subscription "tap_sub_a_b" will resume retaining the information for detecting conflicts -.*DETAIL:.* Retention is re-enabled as max_retention_duration is set to unlimited.*/, +.*DETAIL:.* Retention is re-enabled because max_retention_duration is set to unlimited.*/, $log_offset); ok( $node_A->poll_query_until( -- 2.51.0.windows.1