Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9D29B200C31 for ; Wed, 22 Feb 2017 03:23:33 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9BBD5160B77; Wed, 22 Feb 2017 02:23:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E812F160B68 for ; Wed, 22 Feb 2017 03:23:32 +0100 (CET) Received: (qmail 41992 invoked by uid 500); 22 Feb 2017 02:23:32 -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 41976 invoked by uid 99); 22 Feb 2017 02:23:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Feb 2017 02:23:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0A632DFF36; Wed, 22 Feb 2017 02:23:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vatamane@apache.org To: commits@couchdb.apache.org Date: Wed, 22 Feb 2017 02:23:32 -0000 Message-Id: <86b5907ad7434d2388eaf71fb440b91d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] fabric commit: updated refs/heads/master to d22903c archived-at: Wed, 22 Feb 2017 02:23:33 -0000 Repository: couchdb-fabric Updated Branches: refs/heads/master 70535eeb9 -> d22903c0c Prevent attachment upload from timing out during update_docs fabric call Currently if an attachment was large enough or the connection was slow enough such that it took more than fabric.request_timeout = 60000 milliseconds, the fabric request would time out during attachment data transfer from coordinator node to other nodes and the whole request would fail. This was most evident when replicating database with large attachments. The fix is to periodically send `attachment_chunk_received` to coordinator to prevent the timeout. COUCHDB-3302 Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/6e9074bc Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/6e9074bc Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/6e9074bc Branch: refs/heads/master Commit: 6e9074bc8778e00471d96191319ac67d6c78c05a Parents: 70535ee Author: Nick Vatamaniuc Authored: Tue Feb 21 17:46:57 2017 -0500 Committer: Nick Vatamaniuc Committed: Tue Feb 21 17:46:57 2017 -0500 ---------------------------------------------------------------------- src/fabric_rpc.erl | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/6e9074bc/src/fabric_rpc.erl ---------------------------------------------------------------------- diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl index 679a305..80b110a 100644 --- a/src/fabric_rpc.erl +++ b/src/fabric_rpc.erl @@ -422,6 +422,7 @@ make_att_reader({follows, Parser, Ref}) -> Parser ! {get_bytes, Ref, self()}, receive {bytes, Ref, Bytes} -> + rexi:reply(attachment_chunk_received), Bytes; {'DOWN', ParserRef, _, _, Reason} -> throw({mp_parser_died, Reason})