summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2016-08-15 10:22:22 +0100
committerRobert Newson <rnewson@apache.org>2016-08-15 10:26:14 +0100
commitef5df133bbee5fef0622ce6cdd646c7a08c11dbb (patch)
tree78190c69582f16a985f6ff61e739f7d19181c477
parent41e529d1724883df6304bfd59937db0122d00082 (diff)
downloadcouchdb-ef5df133bbee5fef0622ce6cdd646c7a08c11dbb.tar.gz
fix replication manager checkpointing (COUCHDB-3104)
Comprised of the following two commits in couch_replicator; commit f67ebff225d63d20ccbcbd33de800f86911a5e79 Author: Nick Vatamaniuc <vatamane@gmail.com> Date: Mon Aug 15 03:20:44 2016 -0400 Fix passing epoch in correctly with rep_db_checkpoint message. This bug was hidden previously because this code never ran due to another bug in handling the stop callback message from change feed. Jira: COUCHDB-3104 commit 40a087630b9b6688fe2db87f1e8adc7972c4a0c9 Author: Nick Vatamaniuc <vatamane@gmail.com> Date: Mon Aug 15 02:50:56 2016 -0400 Fix replicator manager `stop` change feed callback ``` changes_reader_cb({stop, EndSeq, _Pending}, ...) -> ... ``` at one point used to handle changes from `fabric:changes`. It was later optimized to use shard change feeds, but shard change feed callbacks don't get pending info with the `stop` message. As a result replicator manager would always rescan all the changes in a shard on any new change. For reference, where `couch_changes.erl` calls the callback: https://github.com/apache/couchdb-couch/blob/master/src/couch_changes.erl#L654 Jira: COUCHDB-3104
-rw-r--r--rebar.config.script2
1 files changed, 1 insertions, 1 deletions
diff --git a/rebar.config.script b/rebar.config.script
index 841e255b2..f555a156b 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -32,7 +32,7 @@ DepDescs = [
{couch, "couch", "1df597fc2e9a8208e7716f8542a7f6a8e9b606e8"},
{couch_index, "couch-index", "e7d269800302224eacf9585f74eb30822495755b"},
{couch_mrview, "couch-mrview", "157132c6e603b1870a08c04e8459a177387932ed"},
-{couch_replicator, "couch-replicator", "05247a26019ce5416e13ef80a12c307bdc790ee4"},
+{couch_replicator, "couch-replicator", "f67ebff225d63d20ccbcbd33de800f86911a5e79"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "835a41885d1e276d207758954f8238aa7bba0ae8"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},