From: Christian Kruse <cjk@defunct.ch>
Date: Mon, 31 Mar 2014 10:26:33 +0000 (+0200)
Subject: bdr: calling check_sequencer_wakeup() now on UPDATE conflict
X-Git-Url: http://git.postgresql.org/gitweb/static/developers.postgresql.org?a=commitdiff_plain;h=04f700b70e4e420936552c828bb69dbffe2fbec0;p=users%2Fandresfreund%2Fpostgres.git

bdr: calling check_sequencer_wakeup() now on UPDATE conflict

After reading code it seems to be no problem calling
check_sequencer_wakeup() on UPDATE conflict; thus we do it.
---

diff --git a/contrib/bdr/bdr_apply.c b/contrib/bdr/bdr_apply.c
index c18f7957ea..62393ca7f3 100644
--- a/contrib/bdr/bdr_apply.c
+++ b/contrib/bdr/bdr_apply.c
@@ -533,6 +533,8 @@ process_remote_update(StringInfo s)
 		tuple_to_stringinfo(&s_key, RelationGetDescr(idxrel), old_key);
 		bdr_count_update_conflict();
 
+		check_sequencer_wakeup(rel);
+
 		ereport(ERROR,
 				(errcode(ERRCODE_INTEGRITY_CONSTRAINT_VIOLATION),
 				 errmsg("CONFLICT: could not find existing tuple for pkey %s", s_key.data)));
@@ -540,7 +542,6 @@ process_remote_update(StringInfo s)
 		/*
 		 * idxrel and rel will be closed by context cleanup, s_key will be
 		 * cleaned up as well
-		 * TODO but what about check_sequencer_wakeup()?
 		 */
 	}