This is an automated email from the ASF dual-hosted git repository. rabbah pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push: new b1330cf adapt timeouts of controller and nginx (#3010) b1330cf is described below commit b1330cf4dc90caeed07356f38d83b6d13b3c6ae7 Author: Christian Bickel <git...@cbickel.de> AuthorDate: Tue Nov 28 10:12:31 2017 +0100 adapt timeouts of controller and nginx (#3010) --- ansible/roles/nginx/templates/nginx.conf.j2 | 4 ++-- core/controller/src/main/resources/application.conf | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/roles/nginx/templates/nginx.conf.j2 b/ansible/roles/nginx/templates/nginx.conf.j2 index 9efae00..cd726d8 100644 --- a/ansible/roles/nginx/templates/nginx.conf.j2 +++ b/ansible/roles/nginx/templates/nginx.conf.j2 @@ -64,7 +64,7 @@ http { rewrite /(.*) /api/v1/web/${namespace}/$1 break; } proxy_pass http://controllers; - proxy_read_timeout 70s; # 60+10 additional seconds to allow controller to terminate request + proxy_read_timeout 75s; # 70+5 additional seconds to allow controller to terminate request } # proxy to 'public/html' web action by convention @@ -73,7 +73,7 @@ http { rewrite ^ /api/v1/web/${namespace}/public/index.html break; } proxy_pass http://controllers; - proxy_read_timeout 70s; # 60+10 additional seconds to allow controller to terminate request + proxy_read_timeout 75s; # 70+5 additional seconds to allow controller to terminate request } location /blackbox.tar.gz { diff --git a/core/controller/src/main/resources/application.conf b/core/controller/src/main/resources/application.conf index 10615d3..e627e48 100644 --- a/core/controller/src/main/resources/application.conf +++ b/core/controller/src/main/resources/application.conf @@ -22,7 +22,7 @@ akka.http { # The controller holds connections up to 60s for blocking invokes, and # all other operations are expected to complete quickly. We allow a grace # period in addition to the blocking invoke timeout. - request-timeout = 90s + request-timeout = 65s # The maximum number of concurrently accepted connections when using the # `Http().bindAndHandle` methods. @@ -50,7 +50,7 @@ akka.http { # # Explaining the set value: # This must be greater than the request timeout. - idle-timeout = 120s + idle-timeout = 70s parsing { # This indirectly puts a bound on the name of entities @@ -77,4 +77,4 @@ akka { #distributed-data.notify-subscribers-interval = 0.01 } -} \ No newline at end of file +} -- To stop receiving notification emails like this one, please contact ['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].