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 14309108F1 for ; Thu, 3 Oct 2013 18:48:28 +0000 (UTC) Received: (qmail 24665 invoked by uid 500); 3 Oct 2013 18:48:24 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 24170 invoked by uid 500); 3 Oct 2013 18:48:21 -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 24056 invoked by uid 99); 3 Oct 2013 18:48:19 -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, 03 Oct 2013 18:48:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 38C5C90ED26; Thu, 3 Oct 2013 18:48:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: djc@apache.org To: commits@couchdb.apache.org Date: Thu, 03 Oct 2013 18:48:27 -0000 Message-Id: <0e54243fc73c41a3aa4584aba5727908@git.apache.org> In-Reply-To: <9d3721ba72db4f6a821435db2e286c7b@git.apache.org> References: <9d3721ba72db4f6a821435db2e286c7b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/10] git commit: updated refs/heads/master to 4ca2cec Bubble up missing_stub exceptions for proper retry A missing_stub exception is special in that the replicator retries the request without the atts_since optimmization. COUCHDB-1901 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/df0423b5 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/df0423b5 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/df0423b5 Branch: refs/heads/master Commit: df0423b5d5c35170626cfc0c10216d2e72e3a83e Parents: a72d1f9 Author: Adam Kocoloski Authored: Wed Oct 2 17:00:16 2013 -0400 Committer: Adam Kocoloski Committed: Wed Oct 2 17:00:16 2013 -0400 ---------------------------------------------------------------------- src/couch_replicator/src/couch_replicator_api_wrap.erl | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/df0423b5/src/couch_replicator/src/couch_replicator_api_wrap.erl ---------------------------------------------------------------------- diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.erl b/src/couch_replicator/src/couch_replicator_api_wrap.erl index eb7d845..52e15b7 100644 --- a/src/couch_replicator/src/couch_replicator_api_wrap.erl +++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl @@ -215,6 +215,8 @@ open_doc_revs(#httpdb{} = HttpDb, Id, Revs, Options, Fun, Acc) -> receive {'DOWN', Ref, process, Pid, {exit_ok, Ret}} -> Ret; + {'DOWN', Ref, process, Pid, {{nocatch, {missing_stub,_} = Stub}, _}} -> + throw(Stub); {'DOWN', Ref, process, Pid, Else} -> Url = couch_util:url_strip_password( couch_replicator_httpc:full_url(HttpDb, [{path,Path}, {qs,QS}])