diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/replication/logical/reorderbuffer.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 301baff2446..15dc51a94d9 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -1891,6 +1891,8 @@ ReorderBufferSaveTXNSnapshot(ReorderBuffer *rb, ReorderBufferTXN *txn, * Helper function for ReorderBufferProcessTXN to handle the concurrent * abort of the streaming transaction. This resets the TXN such that it * can be used to stream the remaining data of transaction being processed. + * This can happen when the subtransaction is aborted and we still want to + * continue processing the main or other subtransactions data. */ static void ReorderBufferResetTXN(ReorderBuffer *rb, ReorderBufferTXN *txn, @@ -3461,6 +3463,10 @@ ReorderBufferCanStartStreaming(ReorderBuffer *rb) LogicalDecodingContext *ctx = rb->private_data; SnapBuild *builder = ctx->snapshot_builder; + /* We can't start streaming unless a consistent state is reached. */ + if (SnapBuildCurrentState(builder) < SNAPBUILD_CONSISTENT) + return false; + /* * We can't start streaming immediately even if the streaming is enabled * because we previously decoded this transaction and now just are @@ -3468,11 +3474,7 @@ ReorderBufferCanStartStreaming(ReorderBuffer *rb) */ if (ReorderBufferCanStream(rb) && !SnapBuildXactNeedsSkip(builder, ctx->reader->EndRecPtr)) - { - /* We must have a consistent snapshot by this time */ - Assert(SnapBuildCurrentState(builder) == SNAPBUILD_CONSISTENT); return true; - } return false; } |