svn commit: r1475934 - in /incubator/ambari/trunk: ./ ambari-server/conf/unix/ ambari-server/src/main/java/org/apache/ambari/server/configuration/ ambari-server/src/main/java/org/apache/ambari/server/controller/

[swagle]

Author: swagle
Date: Thu Apr 25 20:00:07 2013
New Revision: 1475934

URL: http://svn.apache.org/r1475934
Log:
AMBARI-2024. Ambari Server becomes unresponsive after crashing on http reads on 
jersey. (swagle)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-server/conf/unix/ambari.properties
    
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
    
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1475934&r1=1475933&r2=1475934&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 25 20:00:07 2013
@@ -791,6 +791,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
  
+ AMBARI-2024. Ambari Server becomes unresponsive after crashing on http reads 
+ on jersey. (swagle)
+
  AMBARI-2020. Incorrect behavior of "Services" page. (yusaku)
 
  AMBARI-2018. Hosts page: no filter selection is shown after clicking on

Modified: incubator/ambari/trunk/ambari-server/conf/unix/ambari.properties
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/conf/unix/ambari.properties?rev=1475934&r1=1475933&r2=1475934&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/conf/unix/ambari.properties (original)
+++ incubator/ambari/trunk/ambari-server/conf/unix/ambari.properties Thu Apr 25 
20:00:07 2013
@@ -28,3 +28,4 @@ bootstrap.script=/usr/lib/python2.6/site
 
bootstrap.setup_agent.script=/usr/lib/python2.6/site-packages/ambari_server/setupAgent.py
 server.persistence.inMemory=false
 api.authenticate=true
+server.connection.max.idle.millis=900000

Modified: 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java?rev=1475934&r1=1475933&r2=1475934&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 (original)
+++ 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 Thu Apr 25 20:00:07 2013
@@ -187,7 +187,8 @@ public class Configuration {
   //TODO for development purposes only, should be changed to 'false'
   private static final String SERVER_PERSISTENCE_TYPE_DEFAULT = "local";
 
-
+  private static final String SERVER_CONNECTION_MAX_IDLE_TIME =
+    "server.connection.max.idle.millis";
 
 
   private static final Logger LOG = LoggerFactory.getLogger(
@@ -522,4 +523,8 @@ public class Configuration {
     return 
JPATableGenerationStrategy.fromString(System.getProperty(SERVER_JDBC_GENERATE_TABLES_KEY));
   }
 
+  public int getConnectionMaxIdleTime() {
+    return Integer.parseInt(properties.getProperty
+      (SERVER_CONNECTION_MAX_IDLE_TIME, String.valueOf("900000")));
+  }
 }

Modified: 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java?rev=1475934&r1=1475933&r2=1475934&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 (original)
+++ 
incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
 Thu Apr 25 20:00:07 2013
@@ -291,11 +291,13 @@ public class AmbariServer {
         sapiConnector.setTrustPassword(srvrCrtPass);
         sapiConnector.setKeystoreType("PKCS12");
         sapiConnector.setTruststoreType("PKCS12");
+        sapiConnector.setMaxIdleTime(configs.getConnectionMaxIdleTime());
         apiConnector = sapiConnector;
       } 
       else  {
         apiConnector = new SelectChannelConnector();
         apiConnector.setPort(configs.getClientApiPort());
+        apiConnector.setMaxIdleTime(configs.getConnectionMaxIdleTime());
       }
 
       server.addConnector(apiConnector);