Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5ec69b7

Browse files
committed
Improve error messages introduced in be87200 and 0fdab27
Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com> Discussion: https://postgr.es/m/20230411.120301.93333867350615278.horikyota.ntt@gmail.com Discussion: https://postgr.es/m/20230412174244.6njadz4uoiez3l74@awork3.anarazel.de
1 parent 9ce04b5 commit 5ec69b7

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/backend/replication/logical/decode.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ xlog_decode(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
177177
Assert(RecoveryInProgress());
178178
ereport(ERROR,
179179
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
180-
errmsg("logical decoding on a standby requires wal_level to be at least logical on the primary")));
180+
errmsg("logical decoding on standby requires wal_level >= logical on the primary")));
181181
}
182182
break;
183183
}

src/backend/replication/logical/logical.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ CheckLogicalDecodingRequirements(void)
137137
if (GetActiveWalLevelOnStandby() < WAL_LEVEL_LOGICAL)
138138
ereport(ERROR,
139139
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
140-
errmsg("logical decoding on a standby requires wal_level to be at least logical on the primary")));
140+
errmsg("logical decoding on standby requires wal_level >= logical on the primary")));
141141
}
142142
}
143143

src/backend/replication/slot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1274,7 +1274,7 @@ ReportSlotInvalidation(ReplicationSlotInvalidationCause cause,
12741274
break;
12751275

12761276
case RS_INVAL_WAL_LEVEL:
1277-
appendStringInfo(&err_detail, _("Logical decoding on standby requires wal_level to be at least logical on the primary server"));
1277+
appendStringInfo(&err_detail, _("Logical decoding on standby requires wal_level >= logical on the primary server."));
12781278
break;
12791279
case RS_INVAL_NONE:
12801280
pg_unreachable();

src/test/recovery/t/035_standby_logical_decoding.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,8 @@ sub check_for_invalidation
596596
check_slots_conflicting_status(1);
597597

598598
$handle = make_slot_active($node_standby, 'wal_level_', 0, \$stdout, \$stderr);
599-
# We are not able to read from the slot as it requires wal_level at least logical on the primary server
600-
check_pg_recvlogical_stderr($handle, "logical decoding on a standby requires wal_level to be at least logical on the primary");
599+
# We are not able to read from the slot as it requires wal_level >= logical on the primary server
600+
check_pg_recvlogical_stderr($handle, "logical decoding on standby requires wal_level >= logical on the primary");
601601

602602
# Restore primary wal_level
603603
$node_primary->append_conf('postgresql.conf',q[

0 commit comments

Comments
 (0)