Author: orudyy
Date: Tue Dec 1 12:54:34 2015
New Revision: 1717414
URL: http://svn.apache.org/viewvc?rev=1717414&view=rev
Log:
QPID-6919: [Java Broker] Limit number of acceptors on HttpPort to avoid Jetty
WARNing
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1717299 https://svn.apache.org/repos/asf/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 1 12:54:34 2015
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299
/qpid/trunk/qpid:796646-796653
Modified:
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1717414&r1=1717413&r2=1717414&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
(original)
+++
qpid/java/branches/6.0.x/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
Tue Dec 1 12:54:34 2015
@@ -359,7 +359,8 @@ public class HttpManagement extends Abst
threadPool.setMaxThreads(threadPoolMaximum +
additionalInternalThreads);
threadPool.setMinThreads(threadPoolMinimum +
additionalInternalThreads);
- connector.setAcceptors(Math.max(1, threadPoolMaximum / 2));
+ int jettyAcceptorLimit = 2 *
Runtime.getRuntime().availableProcessors();
+ connector.setAcceptors(Math.min(Math.max(1, threadPoolMaximum / 2),
jettyAcceptorLimit));
connector.setThreadPool(threadPool);
return connector;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
