Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0726C11BC5 for ; Thu, 28 Aug 2014 12:15:44 +0000 (UTC) Received: (qmail 19726 invoked by uid 500); 28 Aug 2014 12:15:34 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 19558 invoked by uid 500); 28 Aug 2014 12:15:34 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 18314 invoked by uid 99); 28 Aug 2014 12:15:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 12:15:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6CB63A02CDF; Thu, 28 Aug 2014 12:15:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Thu, 28 Aug 2014 12:16:05 -0000 Message-Id: <5aa0c035b26f4404ab76f171749ec4a8@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [34/37] couch-replicator commit: updated refs/heads/master to aafb5f9 Fix the owner check for local replicator dbs Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/commit/9640ccf2 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/tree/9640ccf2 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/diff/9640ccf2 Branch: refs/heads/master Commit: 9640ccf2e9182bcc7119c4cbde01714fad71b24a Parents: c6be20d Author: Paul J. Davis Authored: Tue Aug 12 12:40:14 2014 -0500 Committer: Paul J. Davis Committed: Tue Aug 12 12:40:14 2014 -0500 ---------------------------------------------------------------------- src/couch_replicator_manager.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/9640ccf2/src/couch_replicator_manager.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl index 099b215..411e9e1 100644 --- a/src/couch_replicator_manager.erl +++ b/src/couch_replicator_manager.erl @@ -405,11 +405,13 @@ process_update(State, DbName, {Change}) -> end end. -owner(DbName, DocId) -> +owner(<<"shards/", _/binary>> = DbName, DocId) -> Live = [node()|nodes()], Nodes = lists:sort([N || #shard{node=N} <- mem3:shards(DbName, DocId), lists:member(N, Live)]), - node() =:= hd(mem3_util:rotate_list({DbName, DocId}, Nodes)). + node() =:= hd(mem3_util:rotate_list({DbName, DocId}, Nodes)); +owner(_DbName, _DocId) -> + true. rep_db_update_error(Error, DbName, DocId) -> case Error of