[couchdb] branch junit-reports-and-jenkins-env updated (0ed695c -> e71eafd)

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a change to branch junit-reports-and-jenkins-env
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit 0ed695c  Merge branch 'master' into junit-reports-and-jenkins-env
    omit 98a702c  Fix cpse_test_purge_replication eunit test
    omit 45c3ed8  Increase default HTTP request timeout to 60s
     new e71eafd  Increase default HTTP timeouts

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (0ed695c)
            \
             N -- N -- N   refs/heads/junit-reports-and-jenkins-env (e71eafd)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/couch_pse_tests/src/cpse_test_purge_replication.erl | 11 ++---------
 test/elixir/lib/couch.ex                                |  2 +-
 2 files changed, 3 insertions(+), 10 deletions(-)

[couchdb] 01/01: Increase default HTTP timeouts

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch junit-reports-and-jenkins-env
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit e71eafd6875ccb9bca35f97f1f001b705ca3eb8e
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Mon Jul 29 14:48:40 2019 -0400

    Increase default HTTP timeouts
    
    These are needed to avoid timeouts on ASF Jenkins build farm. The
    httpotion client uses ibrowse underneath, and ibrowse has three
    separate timeouts. We are configuring two of them here: the overall
    request timeout, and one that detects inactivity on the connection.
    We set them slightly differently just to be able to differentiate which
    one fired from the logs.
---
 test/elixir/lib/couch.ex | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/elixir/lib/couch.ex b/test/elixir/lib/couch.ex
index 58581b2..aa79118 100644
--- a/test/elixir/lib/couch.ex
+++ b/test/elixir/lib/couch.ex
@@ -179,13 +179,13 @@ defmodule Couch do
       Keyword.get(
         options,
         :timeout,
-        Application.get_env(:httpotion, :default_timeout, 5000)
+        Application.get_env(:httpotion, :default_timeout, 60_000)
       )
 
     ib_options =
       Keyword.merge(
         Application.get_env(:httpotion, :default_ibrowse, []),
-        Keyword.get(options, :ibrowse, [])
+        Keyword.get(options, :ibrowse, [{:inactivity_timeout, 55_000}])
       )
 
     follow_redirects =