From 573e1c78b30dbd55931d87c64b692d4b3cea1f36 Mon Sep 17 00:00:00 2001 From: Petr Jelinek Date: Thu, 9 Mar 2017 12:54:43 +0100 Subject: [PATCH] Fix remote position tracking in logical replication We need to set the origin remote position to end_lsn and not commit_lsn as commit_lsn is start of commit record and we use the origin remote position as start position when restarting replication stream. If we'd use commit_lsn we could request data that we already received from remote server after crash of downstream server. --- src/backend/replication/logical/worker.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index 535aa2d..499c093 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -395,9 +395,6 @@ apply_handle_begin(StringInfo s) logicalrep_read_begin(s, &begin_data); - replorigin_session_origin_timestamp = begin_data.committime; - replorigin_session_origin_lsn = begin_data.final_lsn; - in_remote_transaction = true; pgstat_report_activity(STATE_RUNNING, NULL); @@ -415,11 +412,15 @@ apply_handle_commit(StringInfo s) logicalrep_read_commit(s, &commit_data); - Assert(commit_data.commit_lsn == replorigin_session_origin_lsn); - Assert(commit_data.committime == replorigin_session_origin_timestamp); - if (IsTransactionState()) { + /* + * Update origin state so we can restart streaming from correct + * position in case of crash. + */ + replorigin_session_origin_lsn = commit_data.end_lsn; + replorigin_session_origin_timestamp = commit_data.committime; + CommitTransactionCommand(); store_flush_position(commit_data.end_lsn); -- 2.7.4