mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the display of UNKNOWN message type in apply worker.

Browse Source 
We include the message type while displaying an error context in the
apply worker. Now, while retrieving the message type string if the
message type is unknown we throw an error that will hide the original
error. So, instead, we need to simply return the string indicating an
unknown message type.

Reported-by: Ashutosh Bapat
Author: Euler Taveira, Amit Kapila
Reviewed-by: Ashutosh Bapat
Backpatch-through: 15
Discussion: https://postgr.es/m/CAExHW5suAEDW-mBZt_qu4RVxWZ1vL54-L+ci2zreYWebpzxYsA@mail.gmail.com
This commit is contained in:
Amit Kapila 2023-07-25 09:12:29 +05:30
parent f3bc519288
commit d38ad8e31d
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/replication/logical/proto.c
View File

@ -1213,9 +1213,11 @@ logicalrep_read_stream_abort(StringInfo in,
/* /*
* Get string representing LogicalRepMsgType. * Get string representing LogicalRepMsgType.
*/ */
char * const char *
logicalrep_message_type(LogicalRepMsgType action) logicalrep_message_type(LogicalRepMsgType action)
{ {
static char err_unknown[20];
switch (action) switch (action)
{ {
case LOGICAL_REP_MSG_BEGIN: case LOGICAL_REP_MSG_BEGIN:
@ -1258,7 +1260,12 @@ logicalrep_message_type(LogicalRepMsgType action)
return "STREAM PREPARE"; return "STREAM PREPARE";
} }
elog(ERROR, "invalid logical replication message type \"%c\"", action); /*
* This message provides context in the error raised when applying a
* logical message. So we can't throw an error here. Return an unknown
* indicator value so that the original error is still reported.
*/
snprintf(err_unknown, sizeof(err_unknown), "??? (%d)", action);
return NULL; /* keep compiler quiet */ return err_unknown;
} }

2
src/backend/replication/logical/worker.c
View File

@ -3367,7 +3367,7 @@ apply_dispatch(StringInfo s)
default: default:
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_PROTOCOL_VIOLATION), (errcode(ERRCODE_PROTOCOL_VIOLATION),
errmsg("invalid logical replication message type \"%c\"", action))); errmsg("invalid logical replication message type \"??? (%d)\"", action)));
} }
/* Reset the current command */ /* Reset the current command */

2
src/include/replication/logicalproto.h
View File

@ -269,6 +269,6 @@ extern void logicalrep_write_stream_abort(StringInfo out, TransactionId xid,
extern void logicalrep_read_stream_abort(StringInfo in, extern void logicalrep_read_stream_abort(StringInfo in,
LogicalRepStreamAbortData *abort_data, LogicalRepStreamAbortData *abort_data,
bool read_abort_info); bool read_abort_info);
extern char *logicalrep_message_type(LogicalRepMsgType action); extern const char *logicalrep_message_type(LogicalRepMsgType action);
#endif /* LOGICAL_PROTO_H */ #endif /* LOGICAL_PROTO_H */