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 1d2bd44f9a562ace28b5a5e666b6bac9250a0756..dd0df2e8d45a2e8c8840d09fdf6b9d1393d99265 100644 (file)
--- 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);