Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1056 Adjusting Acceptor values 

I have been doing tests with quiver at large message sizes
the tests would work really slowly without these fixes
This commit is contained in:
Clebert Suconic 2017-03-29 21:41:21 -04:00 committed by Martyn Taylor
parent 5ca514a2a8
commit 9bef242b74
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/amqp-acceptor.txt
View File

@ -1,3 +1,3 @@
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.--> <!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
<acceptor name="amqp">tcp://${host}:${amqp.port}?protocols=AMQP;useEpoll=true;amqpCredits=1000;amqpMinCredits=300</acceptor> <acceptor name="amqp">tcp://${host}:${amqp.port}?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=AMQP;useEpoll=true;amqpCredits=1000;amqpMinCredits=300</acceptor>

2
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/mqtt-acceptor.txt
View File

@ -1,3 +1,3 @@
<!-- MQTT Acceptor --> <!-- MQTT Acceptor -->
<acceptor name="mqtt">tcp://${host}:${mqtt.port}?protocols=MQTT;useEpoll=true</acceptor> <acceptor name="mqtt">tcp://${host}:${mqtt.port}?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=MQTT;useEpoll=true</acceptor>

2
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/stomp-acceptor.txt
View File

@ -1,3 +1,3 @@
<!-- STOMP Acceptor. --> <!-- STOMP Acceptor. -->
<acceptor name="stomp">tcp://${host}:${stomp.port}?protocols=STOMP;useEpoll=true</acceptor> <acceptor name="stomp">tcp://${host}:${stomp.port}?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=STOMP;useEpoll=true</acceptor>

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/TransportConstants.java
View File

@ -179,9 +179,9 @@ public class TransportConstants {
public static final boolean DEFAULT_TCP_NODELAY = true; public static final boolean DEFAULT_TCP_NODELAY = true;
public static final int DEFAULT_TCP_SENDBUFFER_SIZE = 32768; public static final int DEFAULT_TCP_SENDBUFFER_SIZE = 1024 * 1024;
public static final int DEFAULT_TCP_RECEIVEBUFFER_SIZE = 32768; public static final int DEFAULT_TCP_RECEIVEBUFFER_SIZE = 1024 * 1024;
public static final boolean DEFAULT_HTTP_ENABLED = false; public static final boolean DEFAULT_HTTP_ENABLED = false;

9
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
View File

@ -146,11 +146,14 @@ public class ProtonServerReceiverContext extends ProtonInitializable implements
public void onMessage(Delivery delivery) throws ActiveMQAMQPException { public void onMessage(Delivery delivery) throws ActiveMQAMQPException {
Receiver receiver; Receiver receiver;
try { try {
receiver = ((Receiver) delivery.getLink());
if (!delivery.isReadable()) { if (!delivery.isReadable()) {
return; return;
} }
if (delivery.isPartial()) {
return;
}
receiver = ((Receiver) delivery.getLink());
if (delivery.isPartial()) { if (delivery.isPartial()) {
return; return;
@ -160,11 +163,9 @@ public class ProtonServerReceiverContext extends ProtonInitializable implements
byte[] data; byte[] data;
synchronized (connection.getLock()) {
data = new byte[delivery.available()]; data = new byte[delivery.available()];
receiver.recv(data, 0, data.length); receiver.recv(data, 0, data.length);
receiver.advance(); receiver.advance();
}
if (delivery.getRemoteState() instanceof TransactionalState) { if (delivery.getRemoteState() instanceof TransactionalState) {
@ -174,9 +175,7 @@ public class ProtonServerReceiverContext extends ProtonInitializable implements
sessionSPI.serverSend(tx, receiver, delivery, address, delivery.getMessageFormat(), data); sessionSPI.serverSend(tx, receiver, delivery, address, delivery.getMessageFormat(), data);
synchronized (connection.getLock()) {
flow(amqpCredits, minCreditRefresh); flow(amqpCredits, minCreditRefresh);
}
} catch (Exception e) { } catch (Exception e) {
log.warn(e.getMessage(), e); log.warn(e.getMessage(), e);
Rejected rejected = new Rejected(); Rejected rejected = new Rejected();