You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ra...@apache.org on 2017/11/28 15:07:03 UTC
[incubator-openwhisk-deploy-kube] branch master updated: adapt
timeouts of controller and nginx matching upstream (#93)
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-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push:
new ff947ec adapt timeouts of controller and nginx matching upstream (#93)
ff947ec is described below
commit ff947ec1d329a93a92a373898f8606dda7b653bf
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Tue Nov 28 10:07:00 2017 -0500
adapt timeouts of controller and nginx matching upstream (#93)
adapt timeouts of controller and nginx
updates for upstream change to clustered kafka/zookeeper
Now must define KAFKA_HOSTS and ZOOKEEPER_HOSTS (instead of HOST, PORT pairs).
---
kubernetes/controller/controller.yml | 6 ++----
kubernetes/invoker/invoker.yml | 12 ++++--------
kubernetes/nginx/nginx.conf | 4 ++--
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/kubernetes/controller/controller.yml b/kubernetes/controller/controller.yml
index a696a70..4038f4c 100644
--- a/kubernetes/controller/controller.yml
+++ b/kubernetes/controller/controller.yml
@@ -68,10 +68,8 @@ spec:
value: "-Xmx2g"
# Kafka properties
- - name: "KAFKA_HOST"
- value: "kafka.openwhisk"
- - name: "KAFKA_HOST_PORT"
- value: "9092"
+ - name: "KAFKA_HOSTS"
+ value: "kafka.openwhisk:9092"
# specific controller arguments
- name: "CONTROLLER_INSTANCES"
diff --git a/kubernetes/invoker/invoker.yml b/kubernetes/invoker/invoker.yml
index e79be7b..57d1c38 100644
--- a/kubernetes/invoker/invoker.yml
+++ b/kubernetes/invoker/invoker.yml
@@ -85,16 +85,12 @@ spec:
value: ""
# Kafka properties
- - name: "KAFKA_HOST"
- value: "kafka.openwhisk"
- - name: "KAFKA_HOST_PORT"
- value: "9092"
+ - name: "KAFKA_HOSTS"
+ value: "kafka.openwhisk:9092"
# zookeeper info
- - name: "ZOOKEEPER_HOST"
- value: "zookeeper.openwhisk"
- - name: "ZOOKEEPER_PORT"
- value: "2181"
+ - name: "ZOOKEEPER_HOSTS"
+ value: "zookeeper.openwhisk:2181"
# This property can change since it is generated via Ansible GroupVars
- name: "RUNTIMES_MANIFEST"
diff --git a/kubernetes/nginx/nginx.conf b/kubernetes/nginx/nginx.conf
index 1f586fa..c32a432 100644
--- a/kubernetes/nginx/nginx.conf
+++ b/kubernetes/nginx/nginx.conf
@@ -40,7 +40,7 @@ http {
rewrite /(.*) /api/v1/web/${namespace}/$1 break;
}
proxy_pass http://$controller:8080;
- 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
@@ -49,7 +49,7 @@ http {
rewrite ^ /api/v1/web/${namespace}/public/index.html break;
}
proxy_pass http://$controller:8080;
- 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-0.1.0.tar.gz {
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].