[18/50] [abbrv] git commit: AMBARI-7221 - Ambari Server REST API Memory Leak (jonathanhurley)

2014-10-06 Thread jonathanhurley 
AMBARI-7221 - Ambari Server REST API Memory Leak (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/813f16c0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/813f16c0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/813f16c0

Branch: refs/heads/trunk
Commit: 813f16c0c731d6f6a35d8462d16194a3abac9f98
Parents: c91fab7
Author: Jonathan Hurley 
Authored: Tue Sep 9 21:30:46 2014 -0400
Committer: Jonathan Hurley 
Committed: Wed Sep 10 09:01:51 2014 -0400

--
 ambari-server/conf/unix/ambari.properties   |  3 ++
 .../server/configuration/Configuration.java | 44 ++--
 .../ambari/server/controller/AmbariServer.java  | 22 +++---
 3 files changed, 52 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/813f16c0/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index b77ae32..a0557b7 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -52,3 +52,6 @@ agent.threadpool.size.max=25
 
 # linux open-file limit
 ulimit.open.files=1
+
+# Server HTTP settings
+server.http.session.inactive_timeout=60

http://git-wip-us.apache.org/repos/asf/ambari/blob/813f16c0/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 a21f98c..2839c2c 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
@@ -260,12 +260,11 @@ public class Configuration {
   private static final String RESOURCES_DIR_DEFAULT =
   "/var/lib/ambari-server/resources/";
   private static final String ANONYMOUS_AUDIT_NAME_KEY = 
"anonymous.audit.name";
-  private static final String CLIENT_SECURITY_DEFAULT = "local";
+
   private static final int CLIENT_API_PORT_DEFAULT = 8080;
   private static final int CLIENT_API_SSL_PORT_DEFAULT = 8443;
-  private static final String USER_ROLE_NAME_DEFAULT = "user";
-  private static final String ADMIN_ROLE_NAME_DEFAULT = "admin";
   private static final String LDAP_BIND_ANONYMOUSLY_DEFAULT = "true";
+
   //TODO For embedded server only - should be removed later
   private static final String LDAP_PRIMARY_URL_DEFAULT = "localhost:33389";
   private static final String LDAP_BASE_DN_DEFAULT = 
"dc=ambari,dc=apache,dc=org";
@@ -309,6 +308,8 @@ public class Configuration {
   private static final String VIEW_EXTRACTION_THREADPOOL_TIMEOUT_KEY = 
"view.extraction.threadpool.timeout";
   private static final long VIEW_EXTRACTION_THREADPOOL_TIMEOUT_DEFAULT = 
10L;
 
+  private static final String SERVER_HTTP_SESSION_INACTIVE_TIMEOUT = 
"server.http.session.inactive_timeout";
+
   private static final Logger LOG = LoggerFactory.getLogger(
   Configuration.class);
   private Properties properties;
@@ -401,7 +402,7 @@ public class Configuration {
 }
 configsMap.put(SRVR_CRT_PASS_KEY, password);
 
-if (this.getApiSSLAuthentication()) {
+if (getApiSSLAuthentication()) {
   LOG.info("API SSL Authentication is turned on.");
   File httpsPassFile = new 
File(configsMap.get(CLIENT_API_SSL_KSTR_DIR_NAME_KEY)
 + File.separator + 
configsMap.get(CLIENT_API_SSL_CRT_PASS_FILE_NAME_KEY));
@@ -464,14 +465,14 @@ public class Configuration {
   private synchronized void loadCredentialProvider() {
 if (!credentialProviderInitialized) {
   try {
-this.credentialProvider = new CredentialProvider(null,
+credentialProvider = new CredentialProvider(null,
   getMasterKeyLocation(), isMasterKeyPersisted());
   } catch (Exception e) {
 LOG.info("Credential provider creation failed. Reason: " + 
e.getMessage());
 if (LOG.isDebugEnabled()) {
   e.printStackTrace();
 }
-this.credentialProvider = null;
+credentialProvider = null;
   }
   credentialProviderInitialized = true;
 }
@@ -487,8 +488,9 @@ public class Configuration {
 //Get property file stream from classpath
 InputStream inputStream = 
Configuration.class.getClassLoader().getResourceAsStream(CONFIG_FILE);
 
-if (inputStream == null)
+if (inputStream == null) {
   throw new RuntimeException(CONFIG_FILE + " not found in classpath");
+}
 
 // load the properties
 try {
@@ -531,8 +533,9 @@ public class Confi

[29/30] git commit: AMBARI-7221 - Ambari Server REST API Memory Leak (jonathanhurley)

2014-09-12 Thread jonathanhurley 
AMBARI-7221 - Ambari Server REST API Memory Leak (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33557337
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33557337
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33557337

Branch: refs/heads/branch-alerts-dev
Commit: 33557337bb7bc917fa08509587031e077652803d
Parents: 4209a49
Author: Jonathan Hurley 
Authored: Tue Sep 9 21:30:46 2014 -0400
Committer: Jonathan Hurley 
Committed: Fri Sep 12 19:47:24 2014 -0400

--
 ambari-server/conf/unix/ambari.properties   |  3 ++
 .../server/configuration/Configuration.java | 44 ++--
 .../ambari/server/controller/AmbariServer.java  | 22 +++---
 3 files changed, 52 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/33557337/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index 41cada7..f1bb88c 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -53,3 +53,6 @@ agent.threadpool.size.max=25
 
 # linux open-file limit
 ulimit.open.files=1
+
+# Server HTTP settings
+server.http.session.inactive_timeout=1800

http://git-wip-us.apache.org/repos/asf/ambari/blob/33557337/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 78fd7b6..9bdbc31 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
@@ -261,12 +261,11 @@ public class Configuration {
   private static final String RESOURCES_DIR_DEFAULT =
   "/var/lib/ambari-server/resources/";
   private static final String ANONYMOUS_AUDIT_NAME_KEY = 
"anonymous.audit.name";
-  private static final String CLIENT_SECURITY_DEFAULT = "local";
+
   private static final int CLIENT_API_PORT_DEFAULT = 8080;
   private static final int CLIENT_API_SSL_PORT_DEFAULT = 8443;
-  private static final String USER_ROLE_NAME_DEFAULT = "user";
-  private static final String ADMIN_ROLE_NAME_DEFAULT = "admin";
   private static final String LDAP_BIND_ANONYMOUSLY_DEFAULT = "true";
+
   //TODO For embedded server only - should be removed later
   private static final String LDAP_PRIMARY_URL_DEFAULT = "localhost:33389";
   private static final String LDAP_BASE_DN_DEFAULT = 
"dc=ambari,dc=apache,dc=org";
@@ -310,6 +309,8 @@ public class Configuration {
   private static final String VIEW_EXTRACTION_THREADPOOL_TIMEOUT_KEY = 
"view.extraction.threadpool.timeout";
   private static final long VIEW_EXTRACTION_THREADPOOL_TIMEOUT_DEFAULT = 
10L;
 
+  private static final String SERVER_HTTP_SESSION_INACTIVE_TIMEOUT = 
"server.http.session.inactive_timeout";
+
   private static final Logger LOG = LoggerFactory.getLogger(
   Configuration.class);
   private Properties properties;
@@ -404,7 +405,7 @@ public class Configuration {
 }
 configsMap.put(SRVR_CRT_PASS_KEY, password);
 
-if (this.getApiSSLAuthentication()) {
+if (getApiSSLAuthentication()) {
   LOG.info("API SSL Authentication is turned on.");
   File httpsPassFile = new 
File(configsMap.get(CLIENT_API_SSL_KSTR_DIR_NAME_KEY)
 + File.separator + 
configsMap.get(CLIENT_API_SSL_CRT_PASS_FILE_NAME_KEY));
@@ -467,14 +468,14 @@ public class Configuration {
   private synchronized void loadCredentialProvider() {
 if (!credentialProviderInitialized) {
   try {
-this.credentialProvider = new CredentialProvider(null,
+credentialProvider = new CredentialProvider(null,
   getMasterKeyLocation(), isMasterKeyPersisted());
   } catch (Exception e) {
 LOG.info("Credential provider creation failed. Reason: " + 
e.getMessage());
 if (LOG.isDebugEnabled()) {
   e.printStackTrace();
 }
-this.credentialProvider = null;
+credentialProvider = null;
   }
   credentialProviderInitialized = true;
 }
@@ -490,8 +491,9 @@ public class Configuration {
 //Get property file stream from classpath
 InputStream inputStream = 
Configuration.class.getClassLoader().getResourceAsStream(CONFIG_FILE);
 
-if (inputStream == null)
+if (inputStream == null) {
   throw new RuntimeException(CONFIG_FILE + " not found in classpath");
+}
 
 // load the properties
 try {
@@ -534,8 +536,9 @@ publ

git commit: AMBARI-7221 - Ambari Server REST API Memory Leak (jonathanhurley)

2014-09-12 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/trunk 4209a4929 -> 33557337b


AMBARI-7221 - Ambari Server REST API Memory Leak (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33557337
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33557337
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33557337

Branch: refs/heads/trunk
Commit: 33557337bb7bc917fa08509587031e077652803d
Parents: 4209a49
Author: Jonathan Hurley 
Authored: Tue Sep 9 21:30:46 2014 -0400
Committer: Jonathan Hurley 
Committed: Fri Sep 12 19:47:24 2014 -0400

--
 ambari-server/conf/unix/ambari.properties   |  3 ++
 .../server/configuration/Configuration.java | 44 ++--
 .../ambari/server/controller/AmbariServer.java  | 22 +++---
 3 files changed, 52 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/33557337/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index 41cada7..f1bb88c 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -53,3 +53,6 @@ agent.threadpool.size.max=25
 
 # linux open-file limit
 ulimit.open.files=1
+
+# Server HTTP settings
+server.http.session.inactive_timeout=1800

http://git-wip-us.apache.org/repos/asf/ambari/blob/33557337/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 78fd7b6..9bdbc31 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
@@ -261,12 +261,11 @@ public class Configuration {
   private static final String RESOURCES_DIR_DEFAULT =
   "/var/lib/ambari-server/resources/";
   private static final String ANONYMOUS_AUDIT_NAME_KEY = 
"anonymous.audit.name";
-  private static final String CLIENT_SECURITY_DEFAULT = "local";
+
   private static final int CLIENT_API_PORT_DEFAULT = 8080;
   private static final int CLIENT_API_SSL_PORT_DEFAULT = 8443;
-  private static final String USER_ROLE_NAME_DEFAULT = "user";
-  private static final String ADMIN_ROLE_NAME_DEFAULT = "admin";
   private static final String LDAP_BIND_ANONYMOUSLY_DEFAULT = "true";
+
   //TODO For embedded server only - should be removed later
   private static final String LDAP_PRIMARY_URL_DEFAULT = "localhost:33389";
   private static final String LDAP_BASE_DN_DEFAULT = 
"dc=ambari,dc=apache,dc=org";
@@ -310,6 +309,8 @@ public class Configuration {
   private static final String VIEW_EXTRACTION_THREADPOOL_TIMEOUT_KEY = 
"view.extraction.threadpool.timeout";
   private static final long VIEW_EXTRACTION_THREADPOOL_TIMEOUT_DEFAULT = 
10L;
 
+  private static final String SERVER_HTTP_SESSION_INACTIVE_TIMEOUT = 
"server.http.session.inactive_timeout";
+
   private static final Logger LOG = LoggerFactory.getLogger(
   Configuration.class);
   private Properties properties;
@@ -404,7 +405,7 @@ public class Configuration {
 }
 configsMap.put(SRVR_CRT_PASS_KEY, password);
 
-if (this.getApiSSLAuthentication()) {
+if (getApiSSLAuthentication()) {
   LOG.info("API SSL Authentication is turned on.");
   File httpsPassFile = new 
File(configsMap.get(CLIENT_API_SSL_KSTR_DIR_NAME_KEY)
 + File.separator + 
configsMap.get(CLIENT_API_SSL_CRT_PASS_FILE_NAME_KEY));
@@ -467,14 +468,14 @@ public class Configuration {
   private synchronized void loadCredentialProvider() {
 if (!credentialProviderInitialized) {
   try {
-this.credentialProvider = new CredentialProvider(null,
+credentialProvider = new CredentialProvider(null,
   getMasterKeyLocation(), isMasterKeyPersisted());
   } catch (Exception e) {
 LOG.info("Credential provider creation failed. Reason: " + 
e.getMessage());
 if (LOG.isDebugEnabled()) {
   e.printStackTrace();
 }
-this.credentialProvider = null;
+credentialProvider = null;
   }
   credentialProviderInitialized = true;
 }
@@ -490,8 +491,9 @@ public class Configuration {
 //Get property file stream from classpath
 InputStream inputStream = 
Configuration.class.getClassLoader().getResourceAsStream(CONFIG_FILE);
 
-if (inputStream == null)
+if (inputStream == null) {
   throw new RuntimeException(CONFIG_FILE + " not found in classpath");
+

[38/39] git commit: AMBARI-7221 - Ambari Server REST API Memory Leak (jonathanhurley)

2014-09-10 Thread jonathanhurley 
AMBARI-7221 - Ambari Server REST API Memory Leak (jonathanhurley)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/813f16c0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/813f16c0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/813f16c0

Branch: refs/heads/branch-alerts-dev
Commit: 813f16c0c731d6f6a35d8462d16194a3abac9f98
Parents: c91fab7
Author: Jonathan Hurley 
Authored: Tue Sep 9 21:30:46 2014 -0400
Committer: Jonathan Hurley 
Committed: Wed Sep 10 09:01:51 2014 -0400

--
 ambari-server/conf/unix/ambari.properties   |  3 ++
 .../server/configuration/Configuration.java | 44 ++--
 .../ambari/server/controller/AmbariServer.java  | 22 +++---
 3 files changed, 52 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/813f16c0/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index b77ae32..a0557b7 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -52,3 +52,6 @@ agent.threadpool.size.max=25
 
 # linux open-file limit
 ulimit.open.files=1
+
+# Server HTTP settings
+server.http.session.inactive_timeout=60

http://git-wip-us.apache.org/repos/asf/ambari/blob/813f16c0/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 a21f98c..2839c2c 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
@@ -260,12 +260,11 @@ public class Configuration {
   private static final String RESOURCES_DIR_DEFAULT =
   "/var/lib/ambari-server/resources/";
   private static final String ANONYMOUS_AUDIT_NAME_KEY = 
"anonymous.audit.name";
-  private static final String CLIENT_SECURITY_DEFAULT = "local";
+
   private static final int CLIENT_API_PORT_DEFAULT = 8080;
   private static final int CLIENT_API_SSL_PORT_DEFAULT = 8443;
-  private static final String USER_ROLE_NAME_DEFAULT = "user";
-  private static final String ADMIN_ROLE_NAME_DEFAULT = "admin";
   private static final String LDAP_BIND_ANONYMOUSLY_DEFAULT = "true";
+
   //TODO For embedded server only - should be removed later
   private static final String LDAP_PRIMARY_URL_DEFAULT = "localhost:33389";
   private static final String LDAP_BASE_DN_DEFAULT = 
"dc=ambari,dc=apache,dc=org";
@@ -309,6 +308,8 @@ public class Configuration {
   private static final String VIEW_EXTRACTION_THREADPOOL_TIMEOUT_KEY = 
"view.extraction.threadpool.timeout";
   private static final long VIEW_EXTRACTION_THREADPOOL_TIMEOUT_DEFAULT = 
10L;
 
+  private static final String SERVER_HTTP_SESSION_INACTIVE_TIMEOUT = 
"server.http.session.inactive_timeout";
+
   private static final Logger LOG = LoggerFactory.getLogger(
   Configuration.class);
   private Properties properties;
@@ -401,7 +402,7 @@ public class Configuration {
 }
 configsMap.put(SRVR_CRT_PASS_KEY, password);
 
-if (this.getApiSSLAuthentication()) {
+if (getApiSSLAuthentication()) {
   LOG.info("API SSL Authentication is turned on.");
   File httpsPassFile = new 
File(configsMap.get(CLIENT_API_SSL_KSTR_DIR_NAME_KEY)
 + File.separator + 
configsMap.get(CLIENT_API_SSL_CRT_PASS_FILE_NAME_KEY));
@@ -464,14 +465,14 @@ public class Configuration {
   private synchronized void loadCredentialProvider() {
 if (!credentialProviderInitialized) {
   try {
-this.credentialProvider = new CredentialProvider(null,
+credentialProvider = new CredentialProvider(null,
   getMasterKeyLocation(), isMasterKeyPersisted());
   } catch (Exception e) {
 LOG.info("Credential provider creation failed. Reason: " + 
e.getMessage());
 if (LOG.isDebugEnabled()) {
   e.printStackTrace();
 }
-this.credentialProvider = null;
+credentialProvider = null;
   }
   credentialProviderInitialized = true;
 }
@@ -487,8 +488,9 @@ public class Configuration {
 //Get property file stream from classpath
 InputStream inputStream = 
Configuration.class.getClassLoader().getResourceAsStream(CONFIG_FILE);
 
-if (inputStream == null)
+if (inputStream == null) {
   throw new RuntimeException(CONFIG_FILE + " not found in classpath");
+}
 
 // load the properties
 try {
@@ -531,8 +533,9 @@ public