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 4A32A108FA for ; Thu, 3 Oct 2013 18:48:28 +0000 (UTC) Received: (qmail 24701 invoked by uid 500); 3 Oct 2013 18:48:24 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 24386 invoked by uid 500); 3 Oct 2013 18:48:22 -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 24036 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 1F8B990ED1A; 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:21 -0000 Message-Id: <0bfdb5d22cd84318b9dbd23c719a19eb@git.apache.org> In-Reply-To: <9d3721ba72db4f6a821435db2e286c7b@git.apache.org> References: <9d3721ba72db4f6a821435db2e286c7b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/10] git commit: updated refs/heads/master to 4ca2cec Fix replication deadlock after HTTP retries An HTTP failure in the open_doc_revs can lead to a replication deadlock if the retry happens while parsing the multipart/mime response. The UserFun callback can end up attempting to PUT a request using an attachment reader from the failed request while the pid that invoked open_doc_revs will never see the started_open_doc_revs message which indicates a retry has happened. This just spawns a middleman process so that the process that invoked open_doc_revs can listen for the response from the user function as well as the started_open_doc_revs message to handle retries appropriately. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8d6c59d5 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8d6c59d5 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8d6c59d5 Branch: refs/heads/master Commit: 8d6c59d55b097d8db23adef5077df4871e25c34d Parents: fa98265 Author: Paul J. Davis Authored: Tue Apr 2 18:05:30 2013 -0500 Committer: Adam Kocoloski Committed: Wed Oct 2 11:59:31 2013 -0400 ---------------------------------------------------------------------- .../src/couch_replicator_api_wrap.erl | 36 ++++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/8d6c59d5/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 4aabe15..9921560 100644 --- a/src/couch_replicator/src/couch_replicator_api_wrap.erl +++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl @@ -535,7 +535,7 @@ receive_docs(Streamer, UserFun, Ref, UserAcc) -> fun() -> receive_doc_data(Streamer, Ref) end, Ref) of {ok, Doc, Parser} -> - case UserFun({ok, Doc}, UserAcc) of + case run_user_fun(UserFun, {ok, Doc}, UserAcc, Ref) of {ok, UserAcc2} -> ok; {skip, UserAcc2} -> @@ -546,13 +546,13 @@ receive_docs(Streamer, UserFun, Ref, UserAcc) -> {"application/json", []} -> Doc = couch_doc:from_json_obj( ?JSON_DECODE(receive_all(Streamer, Ref, []))), - {_, UserAcc2} = UserFun({ok, Doc}, UserAcc), + {_, UserAcc2} = run_user_fun(UserFun, {ok, Doc}, UserAcc, Ref), receive_docs(Streamer, UserFun, Ref, UserAcc2); {"application/json", [{"error","true"}]} -> {ErrorProps} = ?JSON_DECODE(receive_all(Streamer, Ref, [])), Rev = get_value(<<"missing">>, ErrorProps), Result = {{not_found, missing}, couch_doc:parse_rev(Rev)}, - {_, UserAcc2} = UserFun(Result, UserAcc), + {_, UserAcc2} = run_user_fun(UserFun, Result, UserAcc, Ref), receive_docs(Streamer, UserFun, Ref, UserAcc2) end; {done, Ref} -> @@ -560,6 +560,36 @@ receive_docs(Streamer, UserFun, Ref, UserAcc) -> end. +run_user_fun(UserFun, Arg, UserAcc, OldRef) -> + {Pid, Ref} = spawn_monitor(fun() -> + try UserFun(Arg, UserAcc) of + Resp -> + exit({exit_ok, Resp}) + catch + throw:Reason -> + exit({exit_throw, Reason}); + error:Reason -> + exit({exit_error, Reason}); + exit:Reason -> + exit({exit_exit, Reason}) + end + end), + receive + {started_open_doc_revs, NewRef} -> + erlang:demonitor(Ref, [flush]), + exit(Pid, kill), + restart_remote_open_doc_revs(OldRef, NewRef); + {'DOWN', Ref, process, Pid, {exit_ok, Ret}} -> + Ret; + {'DOWN', Ref, process, Pid, {exit_throw, Reason}} -> + throw(Reason); + {'DOWN', Ref, process, Pid, {exit_error, Reason}} -> + erlang:error(Reason); + {'DOWN', Ref, process, Pid, {exit_exit, Reason}} -> + erlang:exit(Reason) + end. + + restart_remote_open_doc_revs(Ref, NewRef) -> receive {body_bytes, Ref, _} ->