diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-04-28 20:39:04 -0400 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-04-28 20:39:04 -0400 |
| commit | d0abe78d84274cc203f3d117b8006dc2164ca31a (patch) | |
| tree | 34df7310c6f1c9ca08b2df1aceb414d1255ed65c /src/backend/replication/logical/logicalfuncs.c | |
| parent | 52b164c5a00095a34685e66bf64b009578b9cfda (diff) | |
| download | postgresql-d0abe78d84274cc203f3d117b8006dc2164ca31a.tar.gz postgresql-d0abe78d84274cc203f3d117b8006dc2164ca31a.zip | |
Check slot->restart_lsn validity in a few more places
Lack of these checks could cause visible misbehavior, including
assertion failures. This was missed in commit c6550776394e, whereby
restart_lsn becomes invalid when the size limit is exceeded.
Also reword some existing error messages, and add errdetail(), so that
the reported errors all match in spirit.
Author: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Reviewed-by: Álvaro Herrera <alvherre@alvh.no-ip.org>
Discussion: https://postgr.es/m/20200408.093710.447591748588426656.horikyota.ntt@gmail.com
Diffstat (limited to 'src/backend/replication/logical/logicalfuncs.c')
| -rw-r--r-- | src/backend/replication/logical/logicalfuncs.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c index f5384f1df8c..fded8e82908 100644 --- a/src/backend/replication/logical/logicalfuncs.c +++ b/src/backend/replication/logical/logicalfuncs.c @@ -237,6 +237,19 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin LogicalOutputPrepareWrite, LogicalOutputWrite, NULL); + /* + * After the sanity checks in CreateDecodingContext, make sure the + * restart_lsn is valid. Avoid "cannot get changes" wording in this + * errmsg because that'd be confusingly ambiguous about no changes + * being available. + */ + if (XLogRecPtrIsInvalid(MyReplicationSlot->data.restart_lsn)) + ereport(ERROR, + (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), + errmsg("can no longer get changes from replication slot \"%s\"", + NameStr(*name)), + errdetail("This slot has never previously reserved WAL, or has been invalidated."))); + MemoryContextSwitchTo(oldcontext); /* |