ARTEMIS-3720 Exposing global-max-messages on the CLI
This commit is contained in:
Clebert Suconic
clebertsuconic
parent
3627ba57c9
commit
0c651dd17b
|
|
@ -287,6 +287,9 @@ public class Create extends InputAbstract {
|
||||||
@Option(name = "--global-max-size", description = "Maximum amount of memory which message data may consume (Default: Undefined, half of the system's memory)")
|
@Option(name = "--global-max-size", description = "Maximum amount of memory which message data may consume (Default: Undefined, half of the system's memory)")
|
||||||
private String globalMaxSize;
|
private String globalMaxSize;
|
||||||
|
|
||||||
|
@Option(name = "--global-max-messages", description = "Maximum number of messages that will be accepted in memory before using address full policy mode.(Default: Undefined)")
|
||||||
|
private long globalMaxMessages = -1;
|
||||||
|
|
||||||
@Option(name = "--jdbc", description = "It will activate jdbc")
|
@Option(name = "--jdbc", description = "It will activate jdbc")
|
||||||
boolean jdbc;
|
boolean jdbc;
|
||||||
|
|
||||||
|
|
@ -669,6 +672,8 @@ public class Create extends InputAbstract {
|
||||||
filters.put("${encoded.role}", role.replaceAll(" ", "\\\\ "));
|
filters.put("${encoded.role}", role.replaceAll(" ", "\\\\ "));
|
||||||
|
|
||||||
|
|
||||||
|
filters.put("${global-max-messages}", Long.toString(globalMaxMessages));
|
||||||
|
|
||||||
if (globalMaxSize == null || globalMaxSize.trim().equals("")) {
|
if (globalMaxSize == null || globalMaxSize.trim().equals("")) {
|
||||||
filters.put("${global-max-section}", readTextFile(ETC_GLOBAL_MAX_DEFAULT_TXT, filters));
|
filters.put("${global-max-section}", readTextFile(ETC_GLOBAL_MAX_DEFAULT_TXT, filters));
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -4,3 +4,7 @@
|
||||||
You may specify a different value here if you need to customize it to your needs.
|
You may specify a different value here if you need to customize it to your needs.
|
||||||
|
|
||||||
<global-max-size>100Mb</global-max-size> -->
|
<global-max-size>100Mb</global-max-size> -->
|
||||||
|
|
||||||
|
<!-- the maximum number of messages accepted before entering full address mode.
|
||||||
|
if global-max-size is specified the full address mode will be specified by whatever hits it first. -->
|
||||||
|
<global-max-messages>${global-max-messages}</global-max-messages>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,8 @@
|
||||||
<!-- the system will enter into page mode once you hit this limit.
|
<!--
|
||||||
This is an estimate in bytes of how much the messages are using in memory -->
|
the system will enter into page mode once you hit this limit.
|
||||||
|
This is an estimate in bytes of how much the messages are using in memory -->
|
||||||
<global-max-size>${global-max-size}</global-max-size>
|
<global-max-size>${global-max-size}</global-max-size>
|
||||||
|
|
||||||
|
<!-- the maximum number of messages accepted before entering full address mode.
|
||||||
|
if global-max-size is specified the full address mode will be specified by whatever hits it first. -->
|
||||||
|
<global-max-messages>${global-max-messages}</global-max-messages>
|
||||||
|
|
|
||||||
|
|
@ -909,7 +909,6 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!-- this makes it easier in certain envs -->
|
<!-- this makes it easier in certain envs -->
|
||||||
<configuration>${basedir}/target/classes/servers/pagingGlobalMaxMessages</configuration>
|
|
||||||
<allowAnonymous>true</allowAnonymous>
|
<allowAnonymous>true</allowAnonymous>
|
||||||
<user>admin</user>
|
<user>admin</user>
|
||||||
<password>admin</password>
|
<password>admin</password>
|
||||||
|
|
@ -918,6 +917,8 @@
|
||||||
<!-- this is needed to run the server remotely -->
|
<!-- this is needed to run the server remotely -->
|
||||||
<arg>--java-options</arg>
|
<arg>--java-options</arg>
|
||||||
<arg>-Djava.rmi.server.hostname=localhost</arg>
|
<arg>-Djava.rmi.server.hostname=localhost</arg>
|
||||||
|
<arg>--global-max-messages</arg>
|
||||||
|
<arg>1000</arg>
|
||||||
</args>
|
</args>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
|
||||||
|
|
@ -1,184 +0,0 @@
|
||||||
<?xml version='1.0'?>
|
|
||||||
<!--
|
|
||||||
Licensed to the Apache Software Foundation (ASF) under one
|
|
||||||
or more contributor license agreements. See the NOTICE file
|
|
||||||
distributed with this work for additional information
|
|
||||||
regarding copyright ownership. The ASF licenses this file
|
|
||||||
to you under the Apache License, Version 2.0 (the
|
|
||||||
"License"); you may not use this file except in compliance
|
|
||||||
with the License. You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing,
|
|
||||||
software distributed under the License is distributed on an
|
|
||||||
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
||||||
KIND, either express or implied. See the License for the
|
|
||||||
specific language governing permissions and limitations
|
|
||||||
under the License.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<configuration xmlns="urn:activemq"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
|
|
||||||
|
|
||||||
<core xmlns="urn:activemq:core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="urn:activemq:core ">
|
|
||||||
|
|
||||||
<name>0.0.0.0</name>
|
|
||||||
|
|
||||||
<persistence-enabled>true</persistence-enabled>
|
|
||||||
|
|
||||||
<!-- this could be ASYNCIO or NIO
|
|
||||||
-->
|
|
||||||
<journal-type>NIO</journal-type>
|
|
||||||
|
|
||||||
<paging-directory>./data/paging</paging-directory>
|
|
||||||
|
|
||||||
<bindings-directory>./data/bindings</bindings-directory>
|
|
||||||
|
|
||||||
<journal-directory>./data/journal</journal-directory>
|
|
||||||
|
|
||||||
<large-messages-directory>./data/large-messages</large-messages-directory>
|
|
||||||
|
|
||||||
<journal-datasync>true</journal-datasync>
|
|
||||||
|
|
||||||
<journal-min-files>2</journal-min-files>
|
|
||||||
|
|
||||||
<journal-pool-files>-1</journal-pool-files>
|
|
||||||
|
|
||||||
<message-expiry-scan-period>1000</message-expiry-scan-period>
|
|
||||||
|
|
||||||
<!--
|
|
||||||
You can verify the network health of a particular NIC by specifying the <network-check-NIC> element.
|
|
||||||
<network-check-NIC>theNicName</network-check-NIC>
|
|
||||||
-->
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Use this to use an HTTP server to validate the network
|
|
||||||
<network-check-URL-list>http://www.apache.org</network-check-URL-list> -->
|
|
||||||
|
|
||||||
<!-- <network-check-period>10000</network-check-period> -->
|
|
||||||
<!-- <network-check-timeout>1000</network-check-timeout> -->
|
|
||||||
|
|
||||||
<!-- this is a comma separated list, no spaces, just DNS or IPs
|
|
||||||
it should accept IPV6
|
|
||||||
|
|
||||||
Warning: Make sure you understand your network topology as this is meant to validate if your network is valid.
|
|
||||||
Using IPs that could eventually disappear or be partially visible may defeat the purpose.
|
|
||||||
You can use a list of multiple IPs, and if any successful ping will make the server OK to continue running -->
|
|
||||||
<!-- <network-check-list>10.0.0.1</network-check-list> -->
|
|
||||||
|
|
||||||
<!-- use this to customize the ping used for ipv4 addresses -->
|
|
||||||
<!-- <network-check-ping-command>ping -c 1 -t %d %s</network-check-ping-command> -->
|
|
||||||
|
|
||||||
<!-- use this to customize the ping used for ipv6 addresses -->
|
|
||||||
<!-- <network-check-ping6-command>ping6 -c 1 %2$s</network-check-ping6-command> -->
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- how often we are looking for how many bytes are being used on the disk in ms -->
|
|
||||||
<disk-scan-period>5000</disk-scan-period>
|
|
||||||
|
|
||||||
<!-- once the disk hits this limit the system will block, or close the connection in certain protocols
|
|
||||||
that won't support flow control. -->
|
|
||||||
<max-disk-usage>90</max-disk-usage>
|
|
||||||
|
|
||||||
<global-max-messages>1000</global-max-messages>
|
|
||||||
|
|
||||||
<!-- the system will enter into page mode once you hit this limit.
|
|
||||||
This is an estimate in bytes of how much the messages are using in memory
|
|
||||||
|
|
||||||
The system will use half of the available memory (-Xmx) by default for the global-max-size.
|
|
||||||
You may specify a different value here if you need to customize it to your needs.
|
|
||||||
|
|
||||||
<global-max-size>100Mb</global-max-size>
|
|
||||||
|
|
||||||
-->
|
|
||||||
|
|
||||||
<acceptors>
|
|
||||||
|
|
||||||
<!-- useEpoll means: it will use Netty epoll if you are on a system (Linux) that supports it -->
|
|
||||||
<!-- useKQueue means: it will use Netty kqueue if you are on a system (MacOS) that supports it -->
|
|
||||||
<!-- amqpCredits: The number of credits sent to AMQP producers -->
|
|
||||||
<!-- amqpLowCredits: The server will send the # credits specified at amqpCredits at this low mark -->
|
|
||||||
|
|
||||||
<!-- Acceptor for every supported protocol -->
|
|
||||||
<acceptor name="artemis">tcp://0.0.0.0:61616?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=CORE,AMQP,STOMP,HORNETQ,MQTT,OPENWIRE;useEpoll=true;useKQueue;amqpCredits=1000;amqpLowCredits=300;actorThresholdBytes=10000</acceptor>
|
|
||||||
|
|
||||||
<!-- AMQP Acceptor. Listens on default AMQP port for AMQP traffic.-->
|
|
||||||
<acceptor name="amqp">tcp://0.0.0.0:5672?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=AMQP;useEpoll=true;useKQueue=true;amqpCredits=1000;amqpLowCredits=300</acceptor>
|
|
||||||
|
|
||||||
<!-- STOMP Acceptor. -->
|
|
||||||
<acceptor name="stomp">tcp://0.0.0.0:61613?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=STOMP;useEpoll=true;useKQueue=true</acceptor>
|
|
||||||
|
|
||||||
<!-- HornetQ Compatibility Acceptor. Enables HornetQ Core and STOMP for legacy HornetQ clients. -->
|
|
||||||
<acceptor name="hornetq">tcp://0.0.0.0:5445?protocols=HORNETQ,STOMP;useEpoll=true;useKQueue=true</acceptor>
|
|
||||||
|
|
||||||
<!-- MQTT Acceptor -->
|
|
||||||
<acceptor name="mqtt">tcp://0.0.0.0:1883?tcpSendBufferSize=1048576;tcpReceiveBufferSize=1048576;protocols=MQTT;useEpoll=true;useKQueue=true</acceptor>
|
|
||||||
|
|
||||||
</acceptors>
|
|
||||||
|
|
||||||
|
|
||||||
<security-settings>
|
|
||||||
<security-setting match="#">
|
|
||||||
<permission type="createNonDurableQueue" roles="guest"/>
|
|
||||||
<permission type="deleteNonDurableQueue" roles="guest"/>
|
|
||||||
<permission type="createDurableQueue" roles="guest"/>
|
|
||||||
<permission type="deleteDurableQueue" roles="guest"/>
|
|
||||||
<permission type="createAddress" roles="guest"/>
|
|
||||||
<permission type="deleteAddress" roles="guest"/>
|
|
||||||
<permission type="consume" roles="guest"/>
|
|
||||||
<permission type="browse" roles="guest"/>
|
|
||||||
<permission type="send" roles="guest"/>
|
|
||||||
<!-- we need this otherwise ./artemis data imp wouldn't work -->
|
|
||||||
<permission type="manage" roles="guest"/>
|
|
||||||
</security-setting>
|
|
||||||
</security-settings>
|
|
||||||
|
|
||||||
<address-settings>
|
|
||||||
<!-- if you define auto-create on certain queues, management has to be auto-create -->
|
|
||||||
<address-setting match="activemq.management#">
|
|
||||||
<dead-letter-address>DLQ</dead-letter-address>
|
|
||||||
<expiry-address>ExpiryQueue</expiry-address>
|
|
||||||
<redelivery-delay>0</redelivery-delay>
|
|
||||||
<!-- with -1 only the global-max-size is in use for limiting -->
|
|
||||||
<max-size-bytes>-1</max-size-bytes>
|
|
||||||
<message-counter-history-day-limit>10</message-counter-history-day-limit>
|
|
||||||
<address-full-policy>PAGE</address-full-policy>
|
|
||||||
<auto-create-queues>true</auto-create-queues>
|
|
||||||
<auto-create-addresses>true</auto-create-addresses>
|
|
||||||
</address-setting>
|
|
||||||
<!--default for catch all-->
|
|
||||||
<address-setting match="#">
|
|
||||||
<dead-letter-address>DLQ</dead-letter-address>
|
|
||||||
<expiry-address>ExpiryQueue</expiry-address>
|
|
||||||
<redelivery-delay>0</redelivery-delay>
|
|
||||||
<!-- with -1 only the global-max-size is in use for limiting -->
|
|
||||||
<max-size-bytes>-1</max-size-bytes>
|
|
||||||
<page-size-bytes>10000</page-size-bytes>
|
|
||||||
<message-counter-history-day-limit>10</message-counter-history-day-limit>
|
|
||||||
<address-full-policy>PAGE</address-full-policy>
|
|
||||||
<auto-create-queues>true</auto-create-queues>
|
|
||||||
<auto-create-addresses>true</auto-create-addresses>
|
|
||||||
</address-setting>
|
|
||||||
</address-settings>
|
|
||||||
|
|
||||||
<addresses>
|
|
||||||
<address name="DLQ">
|
|
||||||
<anycast>
|
|
||||||
<queue name="DLQ" />
|
|
||||||
</anycast>
|
|
||||||
</address>
|
|
||||||
<address name="ExpiryQueue">
|
|
||||||
<anycast>
|
|
||||||
<queue name="ExpiryQueue" />
|
|
||||||
</anycast>
|
|
||||||
</address>
|
|
||||||
|
|
||||||
</addresses>
|
|
||||||
|
|
||||||
</core>
|
|
||||||
</configuration>
|
|
||||||
Loading…
Reference in New Issue