rabbah closed pull request #3010: Adapt timeouts of controller and nginx.
URL: https://github.com/apache/incubator-openwhisk/pull/3010
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2
b/ansible/roles/nginx/templates/nginx.conf.j2
index 9efae0088b..cd726d826a 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 10615d38a5..e627e4899a 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
+}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
