From: Andres Freund <andres@anarazel.de>
Date: Fri, 4 Apr 2014 10:57:08 +0000 (+0200)
Subject: bdr: Fix some embarrassing oversights in recent commits leading to aborting replay.
X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=cd0b3813e6a3c85fe904bc85686b50e37d3d42cb;p=users%2Fandresfreund%2Fpostgres.git

bdr: Fix some embarrassing oversights in recent commits leading to aborting replay.
---

diff --git a/contrib/bdr/bdr_apply.c b/contrib/bdr/bdr_apply.c
index 1d2bd44f9a..dd0df2e8d4 100644
--- a/contrib/bdr/bdr_apply.c
+++ b/contrib/bdr/bdr_apply.c
@@ -422,6 +422,8 @@ process_remote_update(StringInfo s)
 	Relation	idxrel;
 	ScanKeyData skey[INDEX_MAX_KEYS];
 
+	bdr_performing_work();
+
 	rel = read_rel(s, RowExclusiveLock);
 
 	action = pq_getmsgbyte(s);
@@ -567,6 +569,7 @@ check_apply_update(RepNodeId local_node_id, TimestampTz local_ts,
 		 */
 		*perform_update = true;
 		*log_update = false;
+		return;
 	}
 	else
 	{
@@ -686,6 +689,8 @@ process_remote_delete(StringInfo s)
 	bool		found_old;
 	ItemPointerData oldtid;
 
+	bdr_performing_work();
+
 	rel = read_rel(s, RowExclusiveLock);
 
 	action = pq_getmsgbyte(s);