You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/12/10 20:03:38 UTC
ambari git commit: AMBARI-8637. Views: API - URLStreamProvider
timeout control (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk c20ff90d8 -> a91ac591a
AMBARI-8637. Views: API - URLStreamProvider timeout control (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a91ac591
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a91ac591
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a91ac591
Branch: refs/heads/trunk
Commit: a91ac591ab31c7642b1f405504a0ac022b67cf0a
Parents: c20ff90
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Dec 10 21:03:32 2014 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Dec 10 21:03:32 2014 +0200
----------------------------------------------------------------------
ambari-server/conf/unix/ambari.properties | 4 ++++
.../ambari/server/configuration/Configuration.java | 14 ++++++++++++++
.../org/apache/ambari/server/view/ViewRegistry.java | 4 ++--
3 files changed, 20 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a91ac591/ambari-server/conf/unix/ambari.properties
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari.properties b/ambari-server/conf/unix/ambari.properties
index e5b9e7b..9ef645b 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -42,6 +42,10 @@ server.connection.max.idle.millis=900000
server.fqdn.service.url=http://169.254.169.254/latest/meta-data/public-hostname
server.stages.parallel=true
+# Views settings
+views.request.connect.timeout.millis=5000
+views.request.read.timeout.millis=10000
+
# Scheduler settings
server.execution.scheduler.isClustered=false
server.execution.scheduler.maxThreads=5
http://git-wip-us.apache.org/repos/asf/ambari/blob/a91ac591/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 73a353e..da55868 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -114,6 +114,10 @@ public class Configuration {
public static final String CLIENT_API_SSL_KEY_NAME_KEY = "client.api.ssl.key_name";
public static final String SERVER_DB_NAME_KEY = "server.jdbc.database_name";
public static final String SERVER_DB_NAME_DEFAULT = "ambari";
+ public static final String REQUEST_READ_TIMEOUT = "views.request.read.timeout.millis";
+ public static final String REQUEST_READ_TIMEOUT_DEFAULT= "10000";
+ public static final String REQUEST_CONNECT_TIMEOUT = "views.request.connect.timeout.millis";
+ public static final String REQUEST_CONNECT_TIMEOUT_DEFAULT = "5000";
public static final String SERVER_JDBC_POSTGRES_SCHEMA_NAME = "server.jdbc.postgres.schema";
public static final String POSTGRES_DB_NAME = "postgres";
public static final String ORACLE_DB_NAME = "oracle";
@@ -1098,6 +1102,16 @@ public class Configuration {
DEFAULT_SCHEDULER_THREAD_COUNT);
}
+ public Integer getRequestReadTimeout() {
+ return Integer.parseInt(properties.getProperty(REQUEST_READ_TIMEOUT,
+ REQUEST_READ_TIMEOUT_DEFAULT));
+ }
+
+ public Integer getRequestConnectTimeout() {
+ return Integer.parseInt(properties.getProperty(REQUEST_CONNECT_TIMEOUT,
+ REQUEST_CONNECT_TIMEOUT_DEFAULT));
+ }
+
public String getExecutionSchedulerConnections() {
return properties.getProperty(EXECUTION_SCHEDULER_CONNECTIONS,
DEFAULT_SCHEDULER_MAX_CONNECTIONS);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a91ac591/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index 55f3a75..57a05f1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -1426,8 +1426,8 @@ public class ViewRegistry {
ComponentSSLConfiguration configuration1 = ComponentSSLConfiguration.instance();
org.apache.ambari.server.controller.internal.URLStreamProvider streamProvider =
new org.apache.ambari.server.controller.internal.URLStreamProvider(
- DEFAULT_REQUEST_CONNECT_TIMEOUT,
- DEFAULT_REQUEST_READ_TIMEOUT,
+ configuration.getRequestConnectTimeout(),
+ configuration.getRequestReadTimeout(),
configuration1.getTruststorePath(),
configuration1.getTruststorePassword(),
configuration1.getTruststoreType());