Преглед на файлове

AMBARI-1432. Ambari Agent registration hangs due to Acceptor bug in Jetty for not reading through accepted connections. (mahadev)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1446389 13f79535-47bb-0310-9956-ffa450edef68
Mahadev Konar преди 12 години
родител
ревизия
6aa436dfff
променени са 2 файла, в които са добавени 4 реда и са изтрити 1 реда
  1. 2 0
      CHANGES.txt
  2. 2 1
      ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java

+ 2 - 0
CHANGES.txt

@@ -492,6 +492,8 @@ Trunk (unreleased changes):
 
 
  AMBARI-1358. Clean up alert messages. (Yusaku Sako via mahadev)
  AMBARI-1358. Clean up alert messages. (Yusaku Sako via mahadev)
 
 
+ AMBARI-1432. Ambari Agent registration hangs due to Acceptor bug in Jetty for
+ not reading through accepted connections. (mahadev)
 
 
 AMBARI-1.2.0 branch:
 AMBARI-1.2.0 branch:
 
 

+ 2 - 1
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java

@@ -214,7 +214,8 @@ public class AmbariServer {
       // sslConnectorOneWay.setNeedClientAuth(false);
       // sslConnectorOneWay.setNeedClientAuth(false);
       SslSelectChannelConnector sslConnectorOneWay = new SslSelectChannelConnector(contextFactory);
       SslSelectChannelConnector sslConnectorOneWay = new SslSelectChannelConnector(contextFactory);
       sslConnectorOneWay.setPort(AGENT_ONE_WAY_AUTH);
       sslConnectorOneWay.setPort(AGENT_ONE_WAY_AUTH);
-
+      sslConnectorOneWay.setAcceptors(2);
+      sslConnectorTwoWay.setAcceptors(2);
       serverForAgent.setConnectors(new Connector[]{ sslConnectorOneWay, sslConnectorTwoWay});
       serverForAgent.setConnectors(new Connector[]{ sslConnectorOneWay, sslConnectorTwoWay});
 
 
       ServletHolder sh = new ServletHolder(ServletContainer.class);
       ServletHolder sh = new ServletHolder(ServletContainer.class);