(activemq-artemis) branch main updated: ARTEMIS-5035 M_and_M_FactoryTest cannot use OpenWire as it's using JMS2
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 7860fd5fa9 ARTEMIS-5035 M_and_M_FactoryTest cannot use OpenWire as
it's using JMS2
7860fd5fa9 is described below
commit 7860fd5fa91b4b1822a24d6e1bc9617b73228f18
Author: Clebert Suconic
AuthorDate: Wed Sep 18 11:33:05 2024 -0400
ARTEMIS-5035 M_and_M_FactoryTest cannot use OpenWire as it's using JMS2
---
.../org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java | 9 +++--
.../activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index d34285cbfe..33786dcce6 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -229,12 +229,17 @@ public abstract class ActiveMQTestBase extends
ArtemisTestCase {
public ActiveMQTestBase() {
}
+
protected static String randomProtocol() {
- String[] protocols = {"AMQP", "OPENWIRE", "CORE"};
- String protocol =
protocols[org.apache.activemq.artemis.tests.util.RandomUtil.randomPositiveInt()
% 3];
+ return randomProtocol("AMQP", "OPENWIRE", "CORE");
+ }
+
+ protected static String randomProtocol(String...protocols) {
+ String protocol =
protocols[org.apache.activemq.artemis.tests.util.RandomUtil.randomPositiveInt()
% protocols.length];
logger.info("Selecting {} protocol", protocol);
return protocol;
}
+
protected T serialClone(Object object) throws Exception {
logger.debug("object::{}", object);
ByteArrayOutputStream bout = new ByteArrayOutputStream();
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
index dfeb395ee3..4610fc1a5c 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
@@ -125,7 +125,7 @@ public class M_and_M_FactoryTest extends SoakTestBase {
@Test
public void testM_and_M_RandomProtocol() throws Exception {
- test_M_and_M_Sorting(randomProtocol(), 2000, 2, 2, 500);
+ test_M_and_M_Sorting(randomProtocol("AMQP", "CORE"), 2000, 2, 2, 500);
}
public void test_M_and_M_Sorting(String protocol, int batchSize, int
restarts, int clientRuns, int killClientEveryX) throws Exception {
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-5032 Ensure AMQP message priority is honored after restart
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new ec8026e4d6 ARTEMIS-5032 Ensure AMQP message priority is honored after
restart
ec8026e4d6 is described below
commit ec8026e4d605c2a8f98a05118c731e1d26a5c502
Author: Timothy Bish
AuthorDate: Wed Sep 4 18:14:36 2024 -0400
ARTEMIS-5032 Ensure AMQP message priority is honored after restart
Ensure that on server restart the original priority value assigned to an
AMQP message is used when dispatching durable messages from the store.
The AMQP Header section is scanned if present and the priority value
is recovered in an efficient manner.
---
.../protocol/amqp/broker/AMQPLargeMessage.java | 20 +++-
.../artemis/protocol/amqp/broker/AMQPMessage.java | 17 ++-
.../protocol/amqp/broker/AMQPStandardMessage.java | 81 ++
.../protocol/amqp/broker/AMQPPersisterTest.java| 41 ++-
.../activemq/transport/amqp/client/AmqpSender.java | 2 +-
.../integration/amqp/AmqpMessagePriorityTest.java | 123 +++--
6 files changed, 259 insertions(+), 25 deletions(-)
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
index 777f3752ec..71f708873b 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
@@ -66,6 +66,8 @@ public class AMQPLargeMessage extends AMQPMessage implements
LargeServerMessage
}
standardMessage.setMessageAnnotations(messageAnnotations);
standardMessage.setMessageID(messageID);
+ standardMessage.setPriority(getPriority());
+
return standardMessage.toCore();
} catch (Exception e) {
logger.warn(e.getMessage(), e);
@@ -199,7 +201,6 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
}
private void saveEncoding(ByteBuf buf) {
-
WritableBuffer oldBuffer = TLSEncode.getEncoder().getBuffer();
TLSEncode.getEncoder().setByteBuffer(new NettyWritable(buf));
@@ -241,6 +242,11 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
encodedHeaderSize = buf.readInt();
header = (Header)TLSEncode.getDecoder().readObject();
+ // Recover message priority from saved encoding as we store that
separately
+ if (header != null && header.getPriority() != null) {
+priority = (byte) Math.min(header.getPriority().byteValue(),
MAX_MESSAGE_PRIORITY);
+ }
+
deliveryAnnotationsPosition = buf.readInt();
encodedDeliveryAnnotationsSize = buf.readInt();
@@ -264,8 +270,6 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
expiration = System.currentTimeMillis() +
header.getTtl().intValue();
}
}
-
-
} finally {
TLSEncode.getDecoder().setBuffer(oldBuffer);
}
@@ -322,7 +326,6 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
}
public void parseHeader(ReadableBuffer buffer) {
-
DecoderImpl decoder = TLSEncode.getDecoder();
decoder.setBuffer(buffer);
@@ -335,6 +338,9 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
expiration = System.currentTimeMillis() +
header.getTtl().intValue();
}
}
+if (header.getPriority() != null) {
+ priority = (byte) Math.min(header.getPriority().intValue(),
MAX_MESSAGE_PRIORITY);
+}
}
} finally {
decoder.setBuffer(null);
@@ -489,6 +495,9 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
newMessage.setParentRef(this);
newMessage.setFileDurable(this.isDurable());
newMessage.reloadExpiration(this.expiration);
+ if (priority != AMQPMessage.DEFAULT_MESSAGE_PRIORITY) {
+ newMessage.setPriority(priority);
+ }
return newMessage;
}
@@ -502,6 +511,9 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
try {
AMQPLargeMessage copy = new AMQPLargeMessage(newID, messageFormat,
null, coreMessageObjectPools, storageManager);
copy.setDurable(this.isDurable());
+ if (priority != AMQPMessage.DEFAULT_MESSAGE_PRIORITY) {
+copy.setPriority(priority);
+ }
final AtomicInteg
(activemq-artemis) branch main updated: ARTEMIS-5028 use a default filter when none is specified for mngmnt ops
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new defa911143 ARTEMIS-5028 use a default filter when none is specified
for mngmnt ops
defa911143 is described below
commit defa9111438ff0a70e084847feb811b113ed5037
Author: Justin Bertram
AuthorDate: Wed Sep 4 12:19:50 2024 -0500
ARTEMIS-5028 use a default filter when none is specified for mngmnt ops
This is a small usability improvement for management whereby
invocations of some operations no longer require JSON boilerplate. It
impacts the following operations on the ActiveMQServerControl:
- listConnections
- listSessions
- listAddresses
- listQueues
- listConsumers
- listProducers
---
.../management/impl/view/ActiveMQAbstractView.java | 10 +-
.../core/management/impl/view/ViewTest.java| 108 +
2 files changed, 117 insertions(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
index 9522a28654..1491849d6a 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Map;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@@ -43,6 +44,8 @@ public abstract class ActiveMQAbstractView {
private static final String SORT_COLUMN = "sortColumn";
+ private static final JsonObject DEFAULT_FILTER =
JsonUtil.toJsonObject(Map.of(FILTER_FIELD, "", FILTER_OPERATION, "",
FILTER_VALUE, ""));
+
protected Collection collection;
protected ActiveMQFilterPredicate predicate;
@@ -119,7 +122,12 @@ public abstract class ActiveMQAbstractView {
abstract Object getField(T t, String fieldName);
public void setOptions(String options) {
- JsonObject json = JsonUtil.readJsonObject(options);
+ JsonObject json;
+ if (options == null || options.isBlank()) {
+ json = DEFAULT_FILTER;
+ } else {
+ json = JsonUtil.readJsonObject(options);
+ }
if (predicate != null) {
predicate.setField(json.getString(FILTER_FIELD));
predicate.setOperation(json.getString(FILTER_OPERATION));
diff --git
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ViewTest.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ViewTest.java
new file mode 100644
index 00..10b7e2584b
--- /dev/null
+++
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/management/impl/view/ViewTest.java
@@ -0,0 +1,108 @@
+/*
+ * 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.
+ */
+package org.apache.activemq.artemis.core.management.impl.view;
+
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+public class ViewTest {
+
+ @Test
+ public void testDefaultConnectionViewNullOptions() {
+ ConnectionView connectionView = new
ConnectionView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ connectionView.setOptions(null);
+ }
+
+ @Test
+ public void testDefaultConnectionViewEmptyOptions() {
+ ConnectionView connectionView = new
ConnectionView(Mockito.mock(ActiveMQServer.class));
+ // sanity check to ensure this doesn't just blow up
+ connectionView.setOptions("");
+ }
+
+ @Test
+ public void testDefaultSessionViewNullOptions() {
+ SessionView sessionView = new SessionView();
+ // sanity check to ensure this doesn&
(activemq-artemis) branch main updated (74691b8b61 -> 7fb9aa5f97)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 74691b8b61 ARTEMIS-5031 bump owasp.version from 10.0.3 to 10.0.4 add 7fb9aa5f97 ARTEMIS-5010 Addressing deadlock on AckManager No new revisions were added by this update. Summary of changes: .../artemis/protocol/amqp/connect/mirror/AckManager.java | 11 +-- .../mirror/ReplicatedBothNodesMirrorTest.java | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-5001 Relax consistency requirement on OperationContext for Mirror send operations.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new ffafbf350a ARTEMIS-5001 Relax consistency requirement on
OperationContext for Mirror send operations.
ffafbf350a is described below
commit ffafbf350af6f92f7984cbc251be8f2d5dfcf2d4
Author: Clebert Suconic
AuthorDate: Mon Aug 26 12:52:53 2024 -0400
ARTEMIS-5001 Relax consistency requirement on OperationContext for Mirror
send operations.
Send operations should ignore replication, while the ack of the message
should wait a round trip in replication.
That will allow us to ack the message faster and still have consistency
with its replica.
---
.../api/config/ActiveMQDefaultConfiguration.java | 14 +-
.../artemis/core/io/OperationConsistencyLevel.java | 21 ++
.../core/journal/collections/JournalHashMap.java | 3 +
.../protocol/amqp/broker/AMQPSessionCallback.java | 3 +-
.../connect/mirror/AMQPMirrorControllerTarget.java | 19 +-
.../protocol/amqp/connect/mirror/AckManager.java | 14 +-
.../amqp/connect/mirror/MirrorTransaction.java | 7 +
.../amqp/proton/ProtonAbstractReceiver.java| 7 +-
.../core/config/impl/ConfigurationImpl.java| 17 +-
.../artemis/core/persistence/OperationContext.java | 9 +-
.../artemis/core/persistence/StorageManager.java | 2 +
.../journal/AbstractJournalStorageManager.java | 14 +-
.../impl/journal/DummyOperationContext.java| 3 +-
.../impl/journal/OperationContextImpl.java | 201 ++-
.../impl/nullpm/NullStorageManager.java| 8 +-
.../core/transaction/impl/TransactionImpl.java | 7 +-
.../impl/journal/OperationContextUnitTest.java | 137 --
.../core/transaction/impl/TransactionImplTest.java | 6 +
.../artemis/tests/db/paging/PagingTest.java| 3 +-
.../tests/integration/client/SendAckFailTest.java | 6 +
.../persistence/DuplicateCacheTest.java| 3 +-
.../MirrorInfiniteRetryReplicaTest.java| 285 +
22 files changed, 666 insertions(+), 123 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index b8500f153e..d8bf42940d 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -710,8 +710,8 @@ public final class ActiveMQDefaultConfiguration {
// These properties used to defined with this prefix.
// I'm keeping the older property name in an attempt to guarantee
compatibility
private static final String FORMER_ACK_RETRY_CLASS_NAME =
"org.apache.activemq.artemis.protocol.amqp.connect.mirror.AckRetry";
- private static final int DEFAULT_MIRROR_ACK_MANAGER_MIN_QUEUE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MIN_QUEUE_ATTEMPTS", "5"));;
- private static final int DEFAULT_MIRROR_ACK_MANAGER_MAX_PAGE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MAX_PAGE_ATTEMPT", "2"));;
+ private static final int DEFAULT_MIRROR_ACK_MANAGER_QUEUE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MIN_QUEUE_ATTEMPTS", "5"));;
+ private static final int DEFAULT_MIRROR_ACK_MANAGER_PAGE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MAX_PAGE_ATTEMPT", "2"));;
private static final int DEFAULT_MIRROR_ACK_MANAGER_RETRY_DELAY =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".RETRY_DELAY", "100"));;
@@ -1953,19 +1953,19 @@ public final class ActiveMQDefaultConfiguration {
/** This configures the Mirror Ack Manager number of attempts on queues
before trying page acks.
* It is not intended to be configured through the XML.
* The default value here is 5. */
- public static int getMirrorAckManagerMinQueueAttempts() {
- return DEFAULT_MIRROR_ACK_MANAGER_MIN_QUEUE_ATTEMPTS;
+ public static int getMirrorAckManagerQueueAttempts() {
+ return DEFAULT_MIRROR_ACK_MANAGER_QUEUE_ATTEMPTS;
}
- public static int getMirrorAckManagerMaxPageAttempts() {
- return DEFAULT_MIRROR_ACK_MANAGER_MAX_PAGE_ATTEMPTS;
+ public static int getMirrorAckManagerPageAttempts() {
+ return DEFAULT_MIRROR_ACK_MANAGER_PAGE_ATTEMPTS;
}
public static int getMirrorAckManagerRetryDelay() {
return DEFAULT_MIRROR_ACK_MANAGER_RETRY_DELAY;
}
- public stat
(activemq-artemis) branch main updated: ARTEMIS-5017 bridge leaks ClientSessionFactory instance on reconnect attempt
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new d0c83af40e ARTEMIS-5017 bridge leaks ClientSessionFactory instance on
reconnect attempt
d0c83af40e is described below
commit d0c83af40e59ac5ae64a20fbbd0506336c24319f
Author: Justin Bertram
AuthorDate: Wed Aug 28 11:14:38 2024 -0500
ARTEMIS-5017 bridge leaks ClientSessionFactory instance on reconnect attempt
---
.../core/client/impl/ServerLocatorImpl.java| 4 +++
.../core/server/cluster/impl/BridgeImpl.java | 9 ++
.../integration/cluster/bridge/BridgeTest.java | 33 ++
3 files changed, 46 insertions(+)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index c7eff111ca..dd250a9b58 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -1914,6 +1914,10 @@ public final class ServerLocatorImpl implements
ServerLocatorInternal, Discovery
return receivedTopology;
}
+ public int getClientSessionFactoryCount() {
+ return factories.size();
+ }
+
private String fromInterceptors(final List interceptors) {
StringBuffer buffer = new StringBuffer();
boolean first = true;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 01ded75a40..e8659b0cb1 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -205,6 +205,11 @@ public class BridgeImpl implements Bridge,
SessionFailureListener, SendAcknowled
return csf;
}
+ // for tests
+ public ServerLocatorInternal getServerLocator() {
+ return serverLocator;
+ }
+
/* (non-Javadoc)
* @see
org.apache.activemq.artemis.core.server.Consumer#getDeliveringMessages()
*/
@@ -1024,6 +1029,10 @@ public class BridgeImpl implements Bridge,
SessionFailureListener, SendAcknowled
if (csf == null || csf.isClosed()) {
if (state == State.STOPPING || state == State.PAUSING)
return;
+ if (csf != null && csf.isClosed()) {
+ // ensure we release any references to the existing
ClientSessionFactory before creating a new one otherwise we will leak
+ serverLocator.factoryClosed(csf);
+ }
csf = createSessionFactory();
if (csf == null) {
// Retrying. This probably means the node is not
available (for the cluster connection case)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index 23dd1c63a8..72a87c8b97 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -58,6 +58,7 @@ import
org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.api.core.management.BridgeControl;
+import org.apache.activemq.artemis.core.client.impl.ServerLocatorImpl;
import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.TransformerConfiguration;
@@ -521,6 +522,38 @@ public class BridgeTest extends ActiveMQTestBase {
}
}
+ @TestTemplate
+ public void testClientSessionFactoryLeak() throws Exception {
+ Map server0Params = new HashMap<>();
+ server0 = createClusteredServerWithParams(isNetty(), 0, true,
server0Params);
+
+ Map server1Params = new HashMap<>();
+ addTargetParameters(server1Params);
+ server1 = createClusteredServerWithParams(isNetty(), 1, true,
server1Params);
+
+ final String testAddress = "testAddress";
+ final String queueName0 = "queue0";
+ final String forwardAddress = "for
(activemq-artemis) branch main updated: ARTEMIS-5010 just a better description on a log.warn
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 898c09cb93 ARTEMIS-5010 just a better description on a log.warn
898c09cb93 is described below
commit 898c09cb9359d08668d8aa2dd04e1a6a58c40fb6
Author: Clebert Suconic
AuthorDate: Wed Aug 28 18:59:05 2024 -0400
ARTEMIS-5010 just a better description on a log.warn
---
.../protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
index c54a8b8f10..edc73d62e0 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
@@ -205,7 +205,8 @@ public class AMQPMirrorControllerTarget extends
ProtonAbstractReceiver implement
@Override
public void onError(int errorCode, String errorMessage) {
- logger.warn("error code = {} / message = {}", errorCode,
errorMessage);
+ // we are not doing any IO here, this is extremely unlikely
to happen:
+ logger.warn("IO Error code on flushing OperationContext for
AMQPMirrorControllerTarget . error code = {} / message = {}", errorCode,
errorMessage);
latch.countDown();
}
});
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-5018 eliminate deprecated use of Class.newInstance
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 465e985388 ARTEMIS-5018 eliminate deprecated use of Class.newInstance
465e985388 is described below
commit 465e9853880fd2550ff4c17826c6231041130921
Author: Justin Bertram
AuthorDate: Wed Aug 28 15:43:13 2024 -0500
ARTEMIS-5018 eliminate deprecated use of Class.newInstance
---
.../org/apache/activemq/artemis/utils/FactoryFinder.java | 7 ++-
.../apache/activemq/artemis/utils/PasswordMaskingUtil.java | 6 +++---
.../apache/activemq/artemis/jndi/JNDIReferenceFactory.java | 2 +-
.../java/org/apache/activemq/artemis/ra/ActiveMQRaUtils.java | 6 +++---
.../apache/activemq/artemiswrapper/ArtemisBrokerHelper.java | 2 +-
.../apache/activemq/artemis/tests/db/common/Database.java| 3 +--
.../activemq/artemis/tests/e2e/common/ContainerService.java | 2 +-
.../artemis/tests/integration/xa/BasicXaRecoveryTest.java| 2 +-
.../apache/activemq/artemis/jms/tests/ReferenceableTest.java | 12 +++-
.../java/org/objectweb/jtests/jms/admin/AdminFactory.java| 3 +--
.../tests/unit/jms/jndi/StringRefAddrReferenceTest.java | 3 +--
.../unit/ra/referenceable/DestinationObjectFactoryTest.java | 3 +--
.../unit/util/ObjectInputStreamWithClassLoaderTest.java | 2 +-
13 files changed, 24 insertions(+), 29 deletions(-)
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
index 51f0803026..619a937a15 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/FactoryFinder.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.utils;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -61,7 +62,11 @@ public class FactoryFinder {
clazz = loadClass(loadProperties(path));
classMap.put(path, clazz);
}
- return clazz.newInstance();
+ try {
+return clazz.getDeclaredConstructor().newInstance();
+ } catch (NoSuchMethodException | InvocationTargetException e) {
+throw new IOException(e);
+ }
}
static Class loadClass(Properties properties) throws
ClassNotFoundException, IOException {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
index 5125a575ad..9602b5838d 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/PasswordMaskingUtil.java
@@ -184,7 +184,7 @@ public final class PasswordMaskingUtil {
// Service load the codec, if a service is available
for (SensitiveDataCodec codec : serviceLoader) {
if (codec.getClass().getCanonicalName().equals(codecClassName))
{
- return codec.getClass().newInstance();
+ return
codec.getClass().getDeclaredConstructor().newInstance();
}
}
} catch (Exception e) {
@@ -192,11 +192,11 @@ public final class PasswordMaskingUtil {
}
try {
// If a service is not available, load the codec class using this
class's class loader
-return (SensitiveDataCodec)
PasswordMaskingUtil.class.getClassLoader().loadClass(codecClassName).newInstance();
+return (SensitiveDataCodec)
PasswordMaskingUtil.class.getClassLoader().loadClass(codecClassName).getDeclaredConstructor().newInstance();
} catch (Exception e) {
try {
// As a last resort, load the codec class using the current
thread's context class loader
- return (SensitiveDataCodec)
Thread.currentThread().getContextClassLoader().loadClass(codecClassName).newInstance();
+ return (SensitiveDataCodec)
Thread.currentThread().getContextClassLoader().loadClass(codecClassName).getDeclaredConstructor().newInstance();
} catch (Exception e2) {
throw
ActiveMQUtilBundle.BUNDLE.errorCreatingCodec(codecClassName, e2);
}
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/JNDIReferenceFactory.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/JNDIReferenceFactory.java
index 0b4b0c2677..1d367abc9d 100
(activemq-artemis) branch main updated: ARTEMIS-5010 Addressing comments from PR https://github.com/apache/activemq-artemis/pull/5186
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 4352ebae5f ARTEMIS-5010 Addressing comments from PR
https://github.com/apache/activemq-artemis/pull/5186
4352ebae5f is described below
commit 4352ebae5f082924ede54a1599d034c4ea1883d8
Author: Clebert Suconic
AuthorDate: Wed Aug 28 12:56:42 2024 -0400
ARTEMIS-5010 Addressing comments from PR
https://github.com/apache/activemq-artemis/pull/5186
---
.../connect/mirror/AMQPMirrorControllerTarget.java | 17 --
.../protocol/amqp/connect/mirror/AckManager.java | 26 +++---
.../amqp/logger/ActiveMQAMQPProtocolLogger.java| 3 +++
.../amqp/proton/AMQPConnectionContext.java | 17 --
.../protocol/amqp/proton/AMQPSessionContext.java | 2 --
.../persistence/impl/journal/codec/AckRetry.java | 8 +++
.../mirror/ReplicatedBothNodesMirrorTest.java | 25 +++--
7 files changed, 48 insertions(+), 50 deletions(-)
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
index 47b4902b2c..c54a8b8f10 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
@@ -46,6 +46,7 @@ import
org.apache.activemq.artemis.protocol.amqp.broker.AMQPMessage;
import
org.apache.activemq.artemis.protocol.amqp.broker.AMQPMessageBrokerAccessor;
import org.apache.activemq.artemis.protocol.amqp.broker.AMQPSessionCallback;
import org.apache.activemq.artemis.protocol.amqp.broker.ProtonProtocolManager;
+import
org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
import
org.apache.activemq.artemis.protocol.amqp.logger.ActiveMQAMQPProtocolLogger;
import org.apache.activemq.artemis.protocol.amqp.proton.AMQPConnectionContext;
import org.apache.activemq.artemis.protocol.amqp.proton.AMQPSessionContext;
@@ -180,6 +181,15 @@ public class AMQPMirrorControllerTarget extends
ProtonAbstractReceiver implement
private AckManager ackManager;
+ @Override
+ public void close(boolean remoteLinkClose) throws ActiveMQAMQPException {
+ super.close(remoteLinkClose);
+ AckManager localAckManager = ackManager;
+ if (localAckManager != null) {
+ localAckManager.unregisterMirror(this);
+ }
+ }
+
/** This method will wait both replication and storage to finish their
current operations. */
public void flush() {
CountDownLatch latch = new CountDownLatch(1);
@@ -208,7 +218,9 @@ public class AMQPMirrorControllerTarget extends
ProtonAbstractReceiver implement
try {
timeout = connection.getProtocolManager().getAckManagerFlushTimeout();
} catch (Throwable e) {
- logger.warn(e.getMessage(), e);
+ // This is redundant code that should not occur
+ // Only real possibility for this would be a Mocking test, or some
embedded usage
+ logger.warn("Could not access the connection and protocol manager,
using a default timeout of 10 seconds for AckManagerFlushTimeout", e);
timeout = 10_000;
}
@@ -217,7 +229,7 @@ public class AMQPMirrorControllerTarget extends
ProtonAbstractReceiver implement
ActiveMQAMQPProtocolLogger.LOGGER.timedOutAckManager(timeout);
}
} catch (InterruptedException e) {
- logger.warn(e.getMessage(), e);
+ ActiveMQAMQPProtocolLogger.LOGGER.interruptedAckManager(e);
Thread.currentThread().interrupt();
}
}
@@ -457,6 +469,7 @@ public class AMQPMirrorControllerTarget extends
ProtonAbstractReceiver implement
if (ackManager == null) {
ackManager = AckManagerProvider.getManager(server);
+ ackManager.registerMirror(this);
}
ackManager.ack(nodeID, targetQueue, messageID, reason, true);
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AckManager.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AckManager.java
index e829fa8a30..3668935a13 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AckManager.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AckManager.java
@@ -1
(activemq-artemis) branch main updated: ARTEMIS-5010 AckManager records are not replicated
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 4ba9f67d80 ARTEMIS-5010 AckManager records are not replicated
4ba9f67d80 is described below
commit 4ba9f67d80101878b75f27d0247a8e46303e931a
Author: Clebert Suconic
AuthorDate: Thu Aug 22 21:39:08 2024 -0400
ARTEMIS-5010 AckManager records are not replicated
---
.../core/journal/collections/JournalHashMap.java | 13 +-
.../collections/JournalHashMapProvider.java| 5 +-
.../journal/collections/MapStorageManager.java | 36
.../amqp/broker/ProtonProtocolManager.java | 13 ++
.../connect/mirror/AMQPMirrorControllerTarget.java | 45 +
.../protocol/amqp/connect/mirror/AckManager.java | 27 ++-
.../amqp/logger/ActiveMQAMQPProtocolLogger.java| 3 +
.../amqp/proton/AMQPConnectionContext.java | 17 ++
.../protocol/amqp/proton/AMQPSessionContext.java | 2 +
.../artemis/core/persistence/StorageManager.java | 3 +-
.../journal/AbstractJournalStorageManager.java | 41 +
.../persistence/impl/journal/codec/AckRetry.java | 11 +-
.../impl/nullpm/NullStorageManager.java| 29
.../core/transaction/impl/TransactionImplTest.java | 26 +++
.../artemis/tests/util/ActiveMQTestBase.java | 6 +
.../tests/integration/client/SendAckFailTest.java | 32
.../integration/journal/JournalHashMapTest.java| 44 -
.../replication/RepeatStartBackupTest.java | 139 +++-
.../mirror/QuickAckMirrorTest.java | 182 -
.../mirror/ReplicatedBothNodesMirrorTest.java | 180
20 files changed, 611 insertions(+), 243 deletions(-)
diff --git
a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/collections/JournalHashMap.java
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/collections/JournalHashMap.java
index f0d70340dd..f1339588c7 100644
---
a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/collections/JournalHashMap.java
+++
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/collections/JournalHashMap.java
@@ -32,7 +32,6 @@ import java.util.function.Supplier;
import org.apache.activemq.artemis.core.io.IOCriticalErrorListener;
import org.apache.activemq.artemis.core.journal.IOCompletion;
-import org.apache.activemq.artemis.core.journal.Journal;
import org.apache.activemq.artemis.core.persistence.Persister;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -109,7 +108,7 @@ public class JournalHashMap implements Map {
}
}
- public JournalHashMap(long collectionId, Journal journal, LongSupplier
idGenerator, Persister> persister, byte recordType,
Supplier completionSupplier, LongFunction contextProvider,
IOCriticalErrorListener ioExceptionListener) {
+ public JournalHashMap(long collectionId, MapStorageManager journal,
LongSupplier idGenerator, Persister> persister, byte
recordType, Supplier completionSupplier, LongFunction
contextProvider, IOCriticalErrorListener ioExceptionListener) {
this.collectionId = collectionId;
this.journal = journal;
this.idGenerator = idGenerator;
@@ -126,7 +125,7 @@ public class JournalHashMap implements Map {
private final Persister> persister;
- private final Journal journal;
+ private final MapStorageManager journal;
private final long collectionId;
@@ -221,9 +220,9 @@ public class JournalHashMap implements Map {
}
if (callback == null) {
-journal.appendAddRecord(record.id, recordType, persister, record,
false);
+journal.storeMapRecord(record.id, recordType, persister, record,
false);
} else {
-journal.appendAddRecord(record.id, recordType, persister, record,
true, callback);
+journal.storeMapRecord(record.id, recordType, persister, record,
true, callback);
}
} catch (Exception e) {
logger.warn(e.getMessage(), e);
@@ -234,7 +233,7 @@ public class JournalHashMap implements Map {
// callers must be synchronized
private void removed(MapRecord record) {
try {
- journal.appendDeleteRecord(record.id, false);
+ journal.deleteMapRecord(record.id, false);
} catch (Exception e) {
exceptionListener.onIOException(e, e.getMessage(), null);
}
@@ -243,7 +242,7 @@ public class JournalHashMap implements Map {
// callers must be synchronized
private void removed(MapRecord record, long txid) {
try {
- journal.appendDeleteRecordTransactional(txid, record.id);
+ journal.deleteMapRecordTx(txid, record.id);
} catch (Exception e) {
exceptionListener.onIOException(e, e.getMessage(), null);
(activemq-artemis) branch main updated: Revert "ARTEMIS-5001 Option to relax sync on journal replication for Mirroring"
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 38693370c9 Revert "ARTEMIS-5001 Option to relax sync on journal
replication for Mirroring"
38693370c9 is described below
commit 38693370c962f9a4d7fbc9dbeb7bffba18f9ad41
Author: Clebert Suconic
AuthorDate: Mon Aug 26 12:46:29 2024 -0400
Revert "ARTEMIS-5001 Option to relax sync on journal replication for
Mirroring"
This reverts commit d41f01a5aa3722002fc8199eda34198753cc23f2.
---
.../api/config/ActiveMQDefaultConfiguration.java | 20 +-
.../core/journal/collections/JournalHashMap.java | 3 -
.../protocol/amqp/broker/AMQPSessionCallback.java | 3 +-
.../connect/mirror/AMQPMirrorControllerTarget.java | 68 +
.../protocol/amqp/connect/mirror/AckManager.java | 16 +-
.../amqp/proton/ProtonAbstractReceiver.java| 5 +-
.../artemis/core/config/Configuration.java | 6 -
.../core/config/impl/ConfigurationImpl.java| 31 +--
.../deployers/impl/FileConfigurationParser.java| 4 -
.../artemis/core/persistence/OperationContext.java | 7 -
.../impl/journal/OperationContextImpl.java | 40 +--
.../resources/schema/artemis-configuration.xsd | 10 -
.../config/impl/DefaultsFileConfigurationTest.java | 2 -
.../core/config/impl/FileConfigurationTest.java| 1 -
.../impl/journal/OperationContextUnitTest.java | 103 +---
.../resources/ConfigurationTest-full-config.xml| 1 -
.../ConfigurationTest-xinclude-config.xml | 1 -
.../ConfigurationTest-xinclude-schema-config.xml | 1 -
.../MirrorInfiniteRetryReplicaTest.java| 279 -
.../mirror/ReplicatedBothNodesMirrorTest.java | 18 +-
20 files changed, 36 insertions(+), 583 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index c3ab68eacb..b8500f153e 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -710,15 +710,13 @@ public final class ActiveMQDefaultConfiguration {
// These properties used to defined with this prefix.
// I'm keeping the older property name in an attempt to guarantee
compatibility
private static final String FORMER_ACK_RETRY_CLASS_NAME =
"org.apache.activemq.artemis.protocol.amqp.connect.mirror.AckRetry";
- private static final int DEFAULT_MIRROR_ACK_MANAGER_QUEUE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MIN_QUEUE_ATTEMPTS", "5"));;
- private static final int DEFAULT_MIRROR_ACK_MANAGER_PAGE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MAX_PAGE_ATTEMPT", "2"));;
+ private static final int DEFAULT_MIRROR_ACK_MANAGER_MIN_QUEUE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MIN_QUEUE_ATTEMPTS", "5"));;
+ private static final int DEFAULT_MIRROR_ACK_MANAGER_MAX_PAGE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MAX_PAGE_ATTEMPT", "2"));;
private static final int DEFAULT_MIRROR_ACK_MANAGER_RETRY_DELAY =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".RETRY_DELAY", "100"));;
private static final boolean DEFAULT_MIRROR_PAGE_TRANSACTION = false;
- private static final boolean DEFAULT_MIRROR_REPLICA_SYNC = true;
-
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
*/
@@ -1955,23 +1953,19 @@ public final class ActiveMQDefaultConfiguration {
/** This configures the Mirror Ack Manager number of attempts on queues
before trying page acks.
* It is not intended to be configured through the XML.
* The default value here is 5. */
- public static int getMirrorAckManagerQueueAttempts() {
- return DEFAULT_MIRROR_ACK_MANAGER_QUEUE_ATTEMPTS;
+ public static int getMirrorAckManagerMinQueueAttempts() {
+ return DEFAULT_MIRROR_ACK_MANAGER_MIN_QUEUE_ATTEMPTS;
}
- public static int getMirrorAckManagerPageAttempts() {
- return DEFAULT_MIRROR_ACK_MANAGER_PAGE_ATTEMPTS;
+ public static int getMirrorAckManagerMaxPageAttempts() {
+ return DEFAULT_MIRROR_ACK_MANAGER_MAX_PAGE_ATTEMPTS;
}
publ
(activemq-artemis-examples) 03/03: Update examples to version 2.38.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git commit 6f0054f2a1cfa263a5d186d1a0a3b9916ae37d44 Author: Clebert Suconic AuthorDate: Wed Aug 21 16:31:38 2024 -0400 Update examples to version 2.38.0-SNAPSHOT --- artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- examples/features/broker-connection/amqp-federation-over-ssl/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-pull-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml | 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- examples/features/ha/zookeeper-single-pair-failback/pom.xml | 2 +- examples/features/perf
(activemq-artemis-examples) 01/03: Update examples to version 2.36.0
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git commit 02aedb1441236626a544ef86f347f5f0747a6149 Author: Clebert Suconic AuthorDate: Wed Aug 21 16:30:29 2024 -0400 Update examples to version 2.36.0 --- artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- examples/features/broker-connection/amqp-federation-over-ssl/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-pull-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml | 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- examples/features/ha/zookeeper-single-pair-failback/pom.xml | 2 +- examples/features/perf/perf
(activemq-artemis-examples) annotated tag 2.37.0 created (now 581dae3)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to annotated tag 2.37.0 in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git at 581dae3 (tag) tagging c19358e55282d288179009128905bcfd6ab62453 (commit) replaces 2.36.0 by Clebert Suconic on Wed Aug 21 16:31:25 2024 -0400 - Log - Update examples to version 2.37.0 --- This annotated tag includes the following new commits: new 02aedb1 Update examples to version 2.36.0 new c19358e Update examples to version 2.37.0 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis-examples) branch main updated (70f30ed -> c19358e)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git from 70f30ed Update examples to version 2.36.0 add 14da222 Update examples to version 2.37.0-SNAPSHOT add af5ea03 ARTEMIS-4980: dont fork the maven lifecycle, avoid issue from duplicate source plugin runs new 02aedb1 Update examples to version 2.36.0 new c19358e Update examples to version 2.37.0 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- examples/features/broker-connection/amqp-federation-over-ssl/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-pull-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml
(activemq-artemis-examples) 02/03: Update examples to version 2.37.0
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git commit c19358e55282d288179009128905bcfd6ab62453 Author: Clebert Suconic AuthorDate: Wed Aug 21 16:31:25 2024 -0400 Update examples to version 2.37.0 --- artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- examples/features/broker-connection/amqp-federation-over-ssl/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-pull-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml | 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- examples/features/ha/zookeeper-single-pair-failback/pom.xml | 2 +- examples/features/perf/perf
(activemq-artemis-examples) branch development updated (af5ea03 -> 6f0054f)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git from af5ea03 ARTEMIS-4980: dont fork the maven lifecycle, avoid issue from duplicate source plugin runs new 02aedb1 Update examples to version 2.36.0 new c19358e Update examples to version 2.37.0 new 6f0054f Update examples to version 2.38.0-SNAPSHOT The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- examples/features/broker-connection/amqp-federation-over-ssl/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-pull-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-
svn commit: r71051 - /release/activemq/activemq-artemis/2.37.0/
Author: clebertsuconic Date: Wed Aug 21 20:24:19 2024 New Revision: 71051 Log: add files for activemq-artemis-2.37.0 Added: release/activemq/activemq-artemis/2.37.0/ - copied from r71050, dev/activemq/activemq-artemis/2.37.0/ - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 03/03: NO-JIRA Fixing typo on porOffset -> portOffset
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit ac666f3ab12bac16b33999ee0288c0fe70925ae3
Author: Clebert Suconic
AuthorDate: Tue Aug 20 14:42:56 2024 -0400
NO-JIRA Fixing typo on porOffset -> portOffset
---
.../tests/smoke/brokerConnection/DivertQueueMirrorTest.java | 4 ++--
.../smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java| 8
.../soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java | 4 ++--
.../soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java | 4 ++--
.../tests/soak/brokerConnection/mirror/IdempotentACKTest.java | 4 ++--
.../soak/brokerConnection/mirror/InterruptedLargeMessageTest.java | 4 ++--
.../tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java | 4 ++--
.../tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java | 4 ++--
.../tests/soak/brokerConnection/mirror/QuickAckMirrorTest.java| 4 ++--
.../brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java| 8
.../soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java | 8
.../tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java | 4 ++--
.../tests/soak/brokerConnection/sender/SenderSoakTest.java| 4 ++--
13 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
index e7c86a6b65..e966980aec 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
@@ -75,7 +75,7 @@ public class DivertQueueMirrorTest extends SmokeTestBase {
private static void createServer(String serverName,
String connectionName,
String mirrorURI,
-int porOffset) throws Exception {
+int portOffset) throws Exception {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
@@ -87,7 +87,7 @@ public class DivertQueueMirrorTest extends SmokeTestBase {
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE_A);
cliCreateServer.addArgs("--queues", CREATE_QUEUE);
cliCreateServer.addArgs("--java-memory", "512M");
- cliCreateServer.setPortOffset(porOffset);
+ cliCreateServer.setPortOffset(portOffset);
cliCreateServer.createServer();
Properties brokerProperties = new Properties();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
index ddc2256a5a..a8b827ca8b 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
@@ -97,7 +97,7 @@ public class MirrorInfiniteRetryReplicaTest extends
SmokeTestBase {
private static void createMirroredServer(String serverName,
String connectionName,
String mirrorURI,
-int porOffset,
+int portOffset,
boolean replicated,
String clusterStatic) throws
Exception {
File serverLocation = getFileServerLocation(serverName);
@@ -108,7 +108,7 @@ public class MirrorInfiniteRetryReplicaTest extends
SmokeTestBase {
cliCreateServer.setNoWeb(true);
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
cliCreateServer.addArgs("--queues", QUEUE_NAME);
- cliCreateServer.setPortOffset(porOffset);
+ cliCreateServer.setPortOffset(portOffset);
if (replicated) {
cliCreateServer.setReplicated(true);
cliCreateServer.setStaticCluster(clusterStatic);
@@ -162,7 +162,7 @@ public class MirrorInfiniteR
(activemq-artemis) 02/03: ARTEMIS-5001 Option to relax sync on journal replication for Mirroring
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit d41f01a5aa3722002fc8199eda34198753cc23f2
Author: Clebert Suconic
AuthorDate: Mon Aug 19 20:55:02 2024 -0400
ARTEMIS-5001 Option to relax sync on journal replication for Mirroring
Say you use Mirroring and journal replication combined.
The target will wait a round trip on replica before sends are done.
It is possible to ignore that rountrip now with an option added into
Configuration#mirrorReplicaSync
---
.../api/config/ActiveMQDefaultConfiguration.java | 20 +-
.../core/journal/collections/JournalHashMap.java | 3 +
.../protocol/amqp/broker/AMQPSessionCallback.java | 3 +-
.../connect/mirror/AMQPMirrorControllerTarget.java | 68 -
.../protocol/amqp/connect/mirror/AckManager.java | 16 +-
.../amqp/proton/ProtonAbstractReceiver.java| 5 +-
.../artemis/core/config/Configuration.java | 6 +
.../core/config/impl/ConfigurationImpl.java| 31 ++-
.../deployers/impl/FileConfigurationParser.java| 4 +
.../artemis/core/persistence/OperationContext.java | 7 +
.../impl/journal/OperationContextImpl.java | 40 ++-
.../resources/schema/artemis-configuration.xsd | 10 +
.../config/impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java| 1 +
.../impl/journal/OperationContextUnitTest.java | 103 ++-
.../resources/ConfigurationTest-full-config.xml| 1 +
.../ConfigurationTest-xinclude-config.xml | 1 +
.../ConfigurationTest-xinclude-schema-config.xml | 1 +
.../MirrorInfiniteRetryReplicaTest.java} | 309 ++---
.../mirror/ReplicatedBothNodesMirrorTest.java | 18 +-
20 files changed, 386 insertions(+), 263 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index b8500f153e..c3ab68eacb 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -710,13 +710,15 @@ public final class ActiveMQDefaultConfiguration {
// These properties used to defined with this prefix.
// I'm keeping the older property name in an attempt to guarantee
compatibility
private static final String FORMER_ACK_RETRY_CLASS_NAME =
"org.apache.activemq.artemis.protocol.amqp.connect.mirror.AckRetry";
- private static final int DEFAULT_MIRROR_ACK_MANAGER_MIN_QUEUE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MIN_QUEUE_ATTEMPTS", "5"));;
- private static final int DEFAULT_MIRROR_ACK_MANAGER_MAX_PAGE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MAX_PAGE_ATTEMPT", "2"));;
+ private static final int DEFAULT_MIRROR_ACK_MANAGER_QUEUE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MIN_QUEUE_ATTEMPTS", "5"));;
+ private static final int DEFAULT_MIRROR_ACK_MANAGER_PAGE_ATTEMPTS =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".MAX_PAGE_ATTEMPT", "2"));;
private static final int DEFAULT_MIRROR_ACK_MANAGER_RETRY_DELAY =
Integer.parseInt(System.getProperty(FORMER_ACK_RETRY_CLASS_NAME +
".RETRY_DELAY", "100"));;
private static final boolean DEFAULT_MIRROR_PAGE_TRANSACTION = false;
+ private static final boolean DEFAULT_MIRROR_REPLICA_SYNC = true;
+
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
*/
@@ -1953,19 +1955,23 @@ public final class ActiveMQDefaultConfiguration {
/** This configures the Mirror Ack Manager number of attempts on queues
before trying page acks.
* It is not intended to be configured through the XML.
* The default value here is 5. */
- public static int getMirrorAckManagerMinQueueAttempts() {
- return DEFAULT_MIRROR_ACK_MANAGER_MIN_QUEUE_ATTEMPTS;
+ public static int getMirrorAckManagerQueueAttempts() {
+ return DEFAULT_MIRROR_ACK_MANAGER_QUEUE_ATTEMPTS;
}
- public static int getMirrorAckManagerMaxPageAttempts() {
- return DEFAULT_MIRROR_ACK_MANAGER_MAX_PAGE_ATTEMPTS;
+ public static int getMirrorAckManagerPageAttempts() {
+ return DEFAULT_MIRROR_ACK_MANAGER_PAGE_ATTEMPTS;
}
public static int getMirrorAckManagerRetryDelay() {
(activemq-artemis) 01/03: ARTEMIS-5003 User friendly error message in case profile file does not exist
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 534526511f0bce9d564e99babe29cdd7c29ee242
Author: Clebert Suconic
AuthorDate: Tue Aug 20 15:20:37 2024 -0400
ARTEMIS-5003 User friendly error message in case profile file does not exist
---
.../org/apache/activemq/artemis/cli/commands/bin/artemis | 10 ++
.../org/apache/activemq/artemis/cli/commands/bin/artemis.cmd | 11 +++
2 files changed, 21 insertions(+)
diff --git
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index 9d4aeba6e7..7816bf83eb 100755
---
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -57,6 +57,16 @@ if [ -z "$ARTEMIS_PROFILE" ] ; then
fi
fi
+if ! test -f "$ARTEMIS_INSTANCE_ETC/${ARTEMIS_PROFILE}"; then
+ echo
""
+ echo Error: "$ARTEMIS_INSTANCE_ETC/${ARTEMIS_PROFILE}" does not exist.
+ echo
+ echo "This file should have been created as part of you upgrading from a
previous version"
+ echo "Please use 'artemis upgrade' or make sure you create the file."
+ echo
""
+ exit 1
+fi
+
. "$ARTEMIS_INSTANCE_ETC/${ARTEMIS_PROFILE}"
diff --git
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
index e9163a041d..cb10d5a4f6 100644
---
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
+++
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
@@ -52,6 +52,17 @@ set ARTEMIS_PROFILE=artemis-utility.profile.cmd
if "%1"=="run" set ARTEMIS_PROFILE=artemis.profile.cmd
:LOAD_ARTEMIS_PROFILE
+
+IF NOT EXIST %ARTEMIS_INSTANCE_ETC%\%ARTEMIS_PROFILE% (
+ echo
+ echo Error: %ARTEMIS_INSTANCE_ETC%\%ARTEMIS_PROFILE% does not exist.
+ echo.
+ echo This file should have been created as part of you upgrading from a
previous version
+ echo Please use 'artemis upgrade' or make sure you create the file.
+ echo
+exit /b 1
+)
+
call %ARTEMIS_INSTANCE_ETC%\%ARTEMIS_PROFILE% %*
if not exist %ARTEMIS_OOME_DUMP% goto NO_ARTEMIS_OOME_DUMP
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated (c932b75de6 -> ac666f3ab1)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
from c932b75de6 ARTEMIS-4998 Fix Federation link close wrongly closing the
connection
new 534526511f ARTEMIS-5003 User friendly error message in case profile
file does not exist
new d41f01a5aa ARTEMIS-5001 Option to relax sync on journal replication
for Mirroring
new ac666f3ab1 NO-JIRA Fixing typo on porOffset -> portOffset
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../activemq/artemis/cli/commands/bin/artemis | 10 +
.../activemq/artemis/cli/commands/bin/artemis.cmd | 11 +
.../api/config/ActiveMQDefaultConfiguration.java | 20 +-
.../core/journal/collections/JournalHashMap.java | 3 +
.../protocol/amqp/broker/AMQPSessionCallback.java | 3 +-
.../connect/mirror/AMQPMirrorControllerTarget.java | 68 -
.../protocol/amqp/connect/mirror/AckManager.java | 16 +-
.../amqp/proton/ProtonAbstractReceiver.java| 5 +-
.../artemis/core/config/Configuration.java | 6 +
.../core/config/impl/ConfigurationImpl.java| 31 +-
.../deployers/impl/FileConfigurationParser.java| 4 +
.../artemis/core/persistence/OperationContext.java | 7 +
.../impl/journal/OperationContextImpl.java | 40 ++-
.../resources/schema/artemis-configuration.xsd | 10 +
.../config/impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java| 1 +
.../impl/journal/OperationContextUnitTest.java | 103 ++-
.../resources/ConfigurationTest-full-config.xml| 1 +
.../ConfigurationTest-xinclude-config.xml | 1 +
.../ConfigurationTest-xinclude-schema-config.xml | 1 +
.../brokerConnection/DivertQueueMirrorTest.java| 4 +-
.../MirrorInfiniteRetryReplicaTest.java} | 313 ++---
.../mirror/AccumulatedInPageSoakTest.java | 4 +-
.../mirror/ClusteredMirrorSoakTest.java| 4 +-
.../brokerConnection/mirror/IdempotentACKTest.java | 4 +-
.../mirror/InterruptedLargeMessageTest.java| 4 +-
.../mirror/MultiMirrorSoakTest.java| 4 +-
.../brokerConnection/mirror/PagedSNFSoakTest.java | 4 +-
.../mirror/QuickAckMirrorTest.java | 4 +-
.../mirror/ReplicatedBothNodesMirrorTest.java | 26 +-
.../mirror/ReplicatedMirrorTargetTest.java | 8 +-
.../mirror/SingleMirrorSoakTest.java | 4 +-
.../brokerConnection/sender/SenderSoakTest.java| 4 +-
33 files changed, 437 insertions(+), 293 deletions(-)
copy
tests/{soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
=>
smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java}
(51%)
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-website) branch main updated: commit report for 2.37.0
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new bcd1d5fc7 commit report for 2.37.0 bcd1d5fc7 is described below commit bcd1d5fc7ec53ad2c0c09029530362aca4d1fdad Author: Clebert Suconic AuthorDate: Fri Aug 16 11:08:03 2024 -0400 commit report for 2.37.0 --- .../artemis/download/commit-report-2.37.0.html | 37 -- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/components/artemis/download/commit-report-2.37.0.html b/src/components/artemis/download/commit-report-2.37.0.html index 40998322d..0a5a67a80 100644 --- a/src/components/artemis/download/commit-report-2.37.0.html +++ b/src/components/artemis/download/commit-report-2.37.0.html @@ -14,7 +14,7 @@ -Release report 2.36.0(75f17ba64df10663a14fcc85bcb5398d23941b6d) and 2.37.0(de6efc82d1a79d76a63ea3a07bfb29e739634ff1) +Release report 2.36.0(75f17ba64df10663a14fcc85bcb5398d23941b6d) and 2.37.0(0ec68a93d3421b824f1086cbb45e343ec6acf59b) #CommitDateAuthorShort MessageARTEMIS JIRAsAddRepDelTottestdocs/examples/ @@ -124,8 +124,41 @@ 35 de6efc82024/08/14 14:39:21Clebert Suconic[maven-release-plugin] prepare release 2.37.0 +36 +209f2932024/08/14 14:39:34Clebert Suconic[maven-release-plugin] prepare for next development iteration + +37 +4092b8f2024/08/11 22:29:28dependabot[bot]ARTEMIS-4989 Bump slf4j.version from 2.0.13 to 2.0.16Major/Dependency upgrade/Fixed/Closed (ARTEMIS-4989) + +38 +dc280c82024/08/11 22:30:11dependabot[bot]ARTEMIS-4990 Bump selenium.version from 4.23.0 to 4.23.1Major/Dependency upgrade/Fixed/Closed (ARTEMIS-4990) + +39 +d3955fb2024/08/14 14:25:50dependabot[bot]ARTEMIS-4991 Bump io.micrometer:micrometer-core from 1.13.2 to 1.13.3Major/Dependency upgrade/Fixed/Closed (ARTEMIS-4991) + +40 +a72d3932024/08/14 14:51:11dependabot[bot]ARTEMIS-4992 Bump org.codehaus.mojo:exec-maven-plugin from 3.3.0 to 3.4.1Major/Dependency upgrade/Fixed/Closed (ARTEMIS-4992) + +41 +32e456c2024/08/15 08:56:13Robbie GemmellARTEMIS-4994: update to Spring 5.3.39Major/Dependency upgrade/Fixed/Closed (ARTEMIS-4994) + +42 +3f5184a2024/08/15 08:53:04Robbie GemmellARTEMIS-4986: fixups for prior PR feedbackMajor/Bug/Fixed/Closed (ARTEMIS-4986) +0505 +43 +583af582024/08/15 18:14:20Clebert SuconicARTEMIS-4986 Tweaks on test: Disable load balancing and check for no messagesMajor/Bug/Fixed/Closed (ARTEMIS-4986) +RollingUpgradeTest.javahttps://github.com/apache/activemq-artemis/commit/1f79341c05d9e512cfd41e828c00bd01ca470fbf'>44 +1f793412024/08/05 08:44:29Howard GaoARTEMIS-4973 pageSizeBytes/pageLimitBytes combination can cause Address full Update docs/user-manual/paging.adocMajor/Bug/Fixed/Closed (ARTEMIS-4973) +198027PageCursorProviderTestAccessor.javahttps://github.com/apache/activemq-artemis/commit/57426379b8083c86e0ec54df625f17734b6faa5e'>45 +57426372024/08/16 10:06:34Clebert Suconicupdating versions.adoc + +46 +0ec68a92024/08/16 10:23:17Clebert Suconic[maven-release-plugin] prepare release 2.37.0 + -24 JIRAS on ARTEMIS JIRAs +https://github.com/rh-messaging/jira-git-report'> jira-git-report - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
svn commit: r70947 - /dev/activemq/activemq-artemis/2.37.0/
Author: clebertsuconic Date: Fri Aug 16 14:53:16 2024 New Revision: 70947 Log: 2.37.0 CR2 upload Added: dev/activemq/activemq-artemis/2.37.0/ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz (with props) dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.asc dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.sha512 dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip (with props) dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.asc dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.sha512 dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.tar.gz (with props) dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.tar.gz.asc dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.tar.gz.sha512 dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.zip (with props) dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.zip.asc dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.zip.sha512 Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.asc == --- dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.asc (added) +++ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.asc Fri Aug 16 14:53:16 2024 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQEzBAABCgAdFiEEKEF8leiQbRCDkoIjVKQ/MlSGhBAFAma/YyQACgkQVKQ/MlSG +hBBunQf9HtEG/55asxqgL+Mh5uaTbs8jaOv67yw2/2bztyQQTa0rt9aFHQcWLFsi +bTcwk5sEkdJq98Qsz47fwnsPWarujYgF5/+i5fGUyFZ30Mb3elW64++50U8wc69K +PlCDtlzO5BqL0DYyy9ZoSR0TKXIqnKxF5Ng5ParwYLsMI7/rKw6ipwrMB+41t7cP +2bbDulomAtcYi1yWyCs6uNlJVR+mtP/2gMYC1WnaZwNKgWGsiQuhu9/gQYbKXIR9 +lqGq7HC6+UWtVgKh427wL1oCeae62DXP6opvJ97x3qgEefB22k07QnnY/wyI+ZGK +gOvi1IEdGelb0srIATjEuaKGgqM4VQ== +=1mWc +-END PGP SIGNATURE- Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.sha512 == --- dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.sha512 (added) +++ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.sha512 Fri Aug 16 14:53:16 2024 @@ -0,0 +1 @@ +f6de62c2cb603c6f74d97b0d78d991e160e83b330b16b7392604c196e566eb78e2e0aa881f1a74031ea9713ee77ffbeaad3b92eed545d8b15599cb39326cc613 apache-artemis-2.37.0-bin.tar.gz Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip == Binary file - no diff available. Propchange: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.asc == --- dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.asc (added) +++ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.asc Fri Aug 16 14:53:16 2024 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQEzBAABCgAdFiEEKEF8leiQbRCDkoIjVKQ/MlSGhBAFAma/YyMACgkQVKQ/MlSG +hBBkIQgAmT1+zAs44iB9l1ciilnCoOrguIaPwOkl8Nza6rV8k8JGSYUmFJyFHpde +LhpEbNmCWkAfi8Kh6dLSvYBKuytsAz3Acaph2LYW7h1sanPnekro6Cq8vEA+hzn/ +xcNAp+WMHpBeXHRsEDHgYS43B9RxFnD7D0naiNzpcOTVJuLSIBKEMkF/xJXmyxBD +A4rJ8X01RkHHNFGtff3yKoWrIy5tYCMYLmlZWvY8AGJTgbrVqdl697VxuQdv0gAZ +8Dtdj2h12neDyGMxLvHx3Eh3Z4qnmLOW/IfI6JYBRAokifWzEUZ3t7kQgOHenhA1 +3iqGpTCBk0xlanxyJplLq8i1wx8C+A== +=qTnn +-END PGP SIGNATURE- Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.sha512 == --- dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.sha512 (added) +++ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.sha512 Fri Aug 16 14:53:16 2024 @@ -0,0 +1 @@ +aa6c7dcd8a6b7bbd35b1af25e55cf3f471b066dc42bcaece942f4d41dc1b06b2e4f71d00a03d3160ed808367b5e9e03522d793302ddb45bc54f4121689e483e7 apache-artemis-2.37.0-bin.zip Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.tar.gz
svn commit: r70946 - /dev/activemq/activemq-artemis/2.37.0/
Author: clebertsuconic Date: Fri Aug 16 14:51:02 2024 New Revision: 70946 Log: removing 2.37.0 CR1 Removed: dev/activemq/activemq-artemis/2.37.0/ - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) annotated tag 2.37.0 created (now 00d75d22fc)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to annotated tag 2.37.0 in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git at 00d75d22fc (tag) tagging 0ec68a93d3421b824f1086cbb45e343ec6acf59b (commit) replaces 2.36.0 by Clebert Suconic on Fri Aug 16 10:23:17 2024 -0400 - Log - [maven-release-plugin] copy for tag 2.37.0 --- No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated (57426379b8 -> c042fb9e13)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 57426379b8 updating versions.adoc new 0ec68a93d3 [maven-release-plugin] prepare release 2.37.0 new c042fb9e13 [maven-release-plugin] prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git commit c042fb9e131194368771be05c0d41243c9fb45f6 Author: Clebert Suconic AuthorDate: Fri Aug 16 10:23:18 2024 -0400 [maven-release-plugin] prepare for next development iteration --- artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 2 +- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-log-annotation-processor/tests/pom.xml | 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 6 +++--- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml | 2 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- tests/karaf-client-integration-tests/pom.xml| 2 +- tests/karaf-server-integration-tests/pom.xml| 2 +- tests/leak-tests/pom.xml| 2
(activemq-artemis) 01/02: [maven-release-plugin] prepare release 2.37.0
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git commit 0ec68a93d3421b824f1086cbb45e343ec6acf59b Author: Clebert Suconic AuthorDate: Fri Aug 16 10:23:17 2024 -0400 [maven-release-plugin] prepare release 2.37.0 --- artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 2 +- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-log-annotation-processor/tests/pom.xml | 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 6 +++--- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml | 2 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- tests/karaf-client-integration-tests/pom.xml| 2 +- tests/karaf-server-integration-tests/pom.xml| 2 +- tests/leak-tests/pom.xml| 2 +- tests
(activemq-artemis) branch main updated: updating versions.adoc
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 57426379b8 updating versions.adoc 57426379b8 is described below commit 57426379b8083c86e0ec54df625f17734b6faa5e Author: Clebert Suconic AuthorDate: Fri Aug 16 10:06:34 2024 -0400 updating versions.adoc --- docs/user-manual/versions.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/user-manual/versions.adoc b/docs/user-manual/versions.adoc index 332d273c69..eca503e63b 100644 --- a/docs/user-manual/versions.adoc +++ b/docs/user-manual/versions.adoc @@ -21,6 +21,7 @@ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&versio * The environment variables of the CLI commands other than run is configurable via the `artemis-utility.profile` file. * The logging configuration of the CLI commands other than run is configurable via the `log4j2-utility.properties` file. * The run command has been removed from the artemis shell, use the `artemis` script (`artemis.cmd` on Windows) to execute it. +* A version compatibility on voting (shared nothing replication quorum protocol) was fixed as part of https://issues.apache.org/jira/browse/ARTEMIS-4986[ARTEMIS-4986] === Upgrading from 2.36.0 - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) annotated tag 2.37.0 deleted (was ba4da1ea11)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to annotated tag 2.37.0 in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git *** WARNING: tag 2.37.0 was deleted! *** tag was ba4da1ea11 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4973 pageSizeBytes/pageLimitBytes combination can cause Address full Update docs/user-manual/paging.adoc
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 1f79341c05 ARTEMIS-4973 pageSizeBytes/pageLimitBytes combination can
cause Address full Update docs/user-manual/paging.adoc
1f79341c05 is described below
commit 1f79341c05d9e512cfd41e828c00bd01ca470fbf
Author: Howard Gao
AuthorDate: Mon Aug 5 20:44:29 2024 +0800
ARTEMIS-4973 pageSizeBytes/pageLimitBytes combination can cause Address full
Update docs/user-manual/paging.adoc
Co-authored-by: Robbie Gemmell
---
.../core/paging/cursor/PageCursorProvider.java | 2 +
.../paging/cursor/impl/PageCursorProviderImpl.java | 5 +-
.../artemis/core/paging/impl/PagingStoreImpl.java | 26 +-
docs/user-manual/paging.adoc | 8 +-
.../impl/PageCursorProviderTestAccessor.java | 4 +
.../artemis/tests/util/ActiveMQTestBase.java | 26 +-
.../tests/integration/paging/PagingSendTest.java | 435 +
7 files changed, 493 insertions(+), 13 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java
index 526289aa00..e5c28aa30c 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageCursorProvider.java
@@ -63,6 +63,8 @@ public interface PageCursorProvider {
*/
void close(PageSubscription pageCursorImpl);
+ void checkClearPageLimit();
+
void counterRebuildStarted();
void counterRebuildDone();
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
index cc4678a576..13909a43c1 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
@@ -247,7 +247,7 @@ public class PageCursorProviderImpl implements
PageCursorProvider {
scheduleCleanup();
}
- private long getNumberOfMessagesOnSubscriptions() {
+ protected long getNumberOfMessagesOnSubscriptions() {
AtomicLong largerCounter = new AtomicLong();
activeCursors.forEach((id, sub) -> {
long value = sub.getCounter().getValue();
@@ -259,7 +259,8 @@ public class PageCursorProviderImpl implements
PageCursorProvider {
return largerCounter.get();
}
- void checkClearPageLimit() {
+ @Override
+ public void checkClearPageLimit() {
pagingStore.checkPageLimit(getNumberOfMessagesOnSubscriptions());
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
index ab3115f97e..5bf29c32c5 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -192,7 +193,7 @@ public class PagingStoreImpl implements PagingStore {
setUnderCallback(this::underSized).setOverCallback(this::overSized).
setOnSizeCallback(pagingManager::addSize);
- applySetting(addressSettings);
+ applySetting(addressSettings, true);
this.executor = executor;
@@ -233,6 +234,10 @@ public class PagingStoreImpl implements PagingStore {
*/
@Override
public void applySetting(final AddressSettings addressSettings) {
+ applySetting(addressSettings, false);
+ }
+
+ private void applySetting(final AddressSettings addressSettings, final
boolean firstTime) {
maxSize = addressSettings.getMaxSizeBytes();
maxPageReadMessages = addressSettings.getMaxReadPageMessages();
@@ -263,14 +268,15 @@ public class PagingStoreImpl implements PagingStore {
pageLimitBytes = addressSettings.getPageLimitBytes();
- if (pageLimitBytes != null && pageLimitBytes.longValue() < 0) {
+ if (pageLimitBytes != null && pageLimitBytes < 0) {
logger.debug("address {} had pageLimitBytes<0, setting it as null",
address);
pageLimitBytes = nul
(activemq-artemis) branch main updated: ARTEMIS-4986 Tweaks on test: Disable load balancing and check for no messages
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 583af58e43 ARTEMIS-4986 Tweaks on test: Disable load balancing and
check for no messages
583af58e43 is described below
commit 583af58e431e6eac96736a6203a8d6c3a1005959
Author: Clebert Suconic
AuthorDate: Thu Aug 15 18:14:20 2024 -0400
ARTEMIS-4986 Tweaks on test: Disable load balancing and check for no
messages
---
.../compatibility/distribution/RollingUpgradeTest.java | 17 +
1 file changed, 17 insertions(+)
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
index edac701ed4..47928af181 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
@@ -148,6 +149,8 @@ public class RollingUpgradeTest extends RealServerTestBase {
File brokerXml = new File(serverLocation, "/etc/broker.xml");
+ assertTrue(FileUtil.findReplace(brokerXml, "ON_DEMAND", "OFF"));
+
if (live) {
boolean replacedMaster = FileUtil.findReplace(brokerXml,
"", " " + replicaGroupName + "\n" + "
true\n" + "
2\n" + "");
replacedMaster |= FileUtil.findReplace(brokerXml, "", "
" + replicaGroupName + "\n" + "
true\n" + "
2\n" + "");
@@ -264,14 +267,17 @@ public class RollingUpgradeTest extends
RealServerTestBase {
consumeMessage(LIVE0_URI, "AMQP");
consumeMessage(LIVE0_URI, "CORE");
consumeMessage(LIVE0_URI, "OPENWIRE");
+ checkNoMessages(LIVE0_URI);
consumeMessage(LIVE1_URI, "AMQP");
consumeMessage(LIVE1_URI, "CORE");
consumeMessage(LIVE1_URI, "OPENWIRE");
+ checkNoMessages(LIVE1_URI);
consumeMessage(LIVE2_URI, "AMQP");
consumeMessage(LIVE2_URI, "CORE");
consumeMessage(LIVE2_URI, "OPENWIRE");
+ checkNoMessages(LIVE2_URI);
}
@@ -302,6 +308,17 @@ public class RollingUpgradeTest extends RealServerTestBase
{
}
}
+ private void checkNoMessages(String uri) throws Exception {
+ ConnectionFactory cf = CFUtil.createConnectionFactory("CORE", uri);
+ try (Connection connection = cf.createConnection();
+ Session session =
connection.createSession(false,Session.AUTO_ACKNOWLEDGE)) {
+ MessageConsumer consumer =
session.createConsumer(session.createQueue(QUEUE_NAME));
+ connection.start();
+ assertNull(consumer.receiveNoWait());
+ consumer.close();
+ }
+ }
+
private Pair rollUpgrade(int liveID,
String liveServerToStop,
SimpleManagement liveManagement,
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4986: fixups for prior PR feedback
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 3f5184a933 ARTEMIS-4986: fixups for prior PR feedback
3f5184a933 is described below
commit 3f5184a933c9eb775c06103d8c7ad0b576673112
Author: Robbie Gemmell
AuthorDate: Thu Aug 15 13:53:04 2024 +0100
ARTEMIS-4986: fixups for prior PR feedback
---
.../java/org/apache/activemq/artemis/core/protocol/core/Channel.java | 4 ++--
.../apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java | 2 +-
.../apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
index d8785952c5..add18c5587 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
@@ -58,8 +58,8 @@ public interface Channel {
boolean supports(byte packetID, int version);
/*
-* Due to ARTEMIS-4986, older versions (2.30.0 in particular) will require
a special voting handling,
-* where we would perform specific retries at older values.
+* Due to ARTEMIS-4986, older versions (<= 2.31.2 in particular) before
2.37.0 will require
+* special voting handling, where we would perform specific retries with
older values.
*/
default boolean requireSpecialVotingHandling() {
return false;
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
index e33d603ffa..12b3fa1c01 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
@@ -202,7 +202,7 @@ public final class ChannelImpl implements Channel {
@Override
public boolean requireSpecialVotingHandling() {
- return connection.getChannelVersion() <
PacketImpl.ARTEMIS_2_36_0_VERSION;
+ return connection.getChannelVersion() <
PacketImpl.ARTEMIS_2_37_0_VERSION;
}
@Override
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
index 137898b4c7..76717a04ef 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
@@ -53,7 +53,8 @@ public class PacketImpl implements Packet {
// 2.29.0
public static final int ARTEMIS_2_29_0_VERSION = 135;
- public static final int ARTEMIS_2_36_0_VERSION = 136;
+ // 2.37.0
+ public static final int ARTEMIS_2_37_0_VERSION = 136;
public static final SimpleString OLD_QUEUE_PREFIX =
SimpleString.of("jms.queue.");
public static final SimpleString OLD_TEMP_QUEUE_PREFIX =
SimpleString.of("jms.tempqueue.");
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-website) branch main updated: 2.37.0 release
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-website.git
The following commit(s) were added to refs/heads/main by this push:
new 156604f94 2.37.0 release
156604f94 is described below
commit 156604f94fa851a3c45483f95837266ee7dfed4f
Author: Clebert Suconic
AuthorDate: Wed Aug 14 16:09:04 2024 -0400
2.37.0 release
---
.../artemis/download/commit-report-2.37.0.html | 131 +
1 file changed, 131 insertions(+)
diff --git a/src/components/artemis/download/commit-report-2.37.0.html
b/src/components/artemis/download/commit-report-2.37.0.html
new file mode 100644
index 0..40998322d
--- /dev/null
+++ b/src/components/artemis/download/commit-report-2.37.0.html
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+$(document).ready( function () {
+$("#gitreport").DataTable();
+} );
+
+
+
+
+
+
+Release report 2.36.0(75f17ba64df10663a14fcc85bcb5398d23941b6d) and
2.37.0(de6efc82d1a79d76a63ea3a07bfb29e739634ff1)
+
+
+#CommitDateAuthorShort
MessageARTEMIS
JIRAsAddRepDelTottestdocs/examples/
+
+1
+fa917ae2024/07/25
13:47:10Clebert Suconic[maven-release-plugin] prepare for
next development iteration
+
+2
+284ce802024/07/25
13:47:10Timothy BishARTEMIS-4952 Use
getObjectPropertyForFilter when applying filtersMinor/Bug/Fixed/Closed
(ARTEMIS-4952)
+0101JMXManagementTest.javahttps://github.com/apache/activemq-artemis/commit/096a869c1ed6102a43074434db07899c70231c4a'>3
+096a8692024/07/25
10:50:14Howard GaoARTEMIS-4954
AddressControl.pause() can pause the snf queueMajor/Bug/Fixed/Closed
(ARTEMIS-4954)
+1616ClusteredBridgeReconnectTest.javahttps://github.com/apache/activemq-artemis/commit/86f36e95b09c709fb7e4af33f4a535f9a80d7221'>4
+86f36e92024/07/29
17:26:39Justin BertramARTEMIS-4960
Ubuntu package name change preventing Docker image buildMajor/Bug/Fixed/Closed
(ARTEMIS-4960)
+
+5
+4ce0dfc2024/07/29
09:09:48Howard GaoARTEMIS-4959
moveMessages operation can move more messages than max
messageCountMajor/Bug/Fixed/Closed
(ARTEMIS-4959)
+1512423ActiveMQTestBase.java(+
[...]
+6
+cbbaa7a2024/07/30
20:11:13Clebert SuconicNO-JIRA Mirror and Divert Smoke
Test
+DivertQueueMirrorTest.javahttps://github.com/apache/activemq-artemis/commit/d7078cabf51b5198e6e0e098245f25eacfe44bb1'>7
+d7078ca2024/07/30
20:44:01Clebert SuconicNO-JIRA tweak on
DivertQueueMirrorTest
+DivertQueueMirrorTest.javahttps://github.com/apache/activemq-artemis/commit/4d8ccc4b2f31428b9caddad20643430e30c0cf32'>8
+4d8ccc42024/05/17
03:38:15Domenico Francesco BruscinoARTEMIS-4955
Support broker properties from JSON filesMajor/Improvement/Fixed/Closed
(ARTEMIS-4955)
+516156ConfigurationImplTest.java(+
[...]
+9
+47acdc42024/08/01
23:07:39Clebert SuconicARTEMIS-4964 Fast
ACK Test with MirrorMajor/Test/Fixed/Closed
(ARTEMIS-4964)
+QuickAckMirrorTest.javahttps://github.com/apache/activemq-artemis/commit/8250e611dfac7ec9b1353a636464fbdc877a8ec1'>10
+8250e612024/08/02
10:56:28Timothy BishARTEMIS-4963
Check send auth on openwire producer createMinor/Improvement/Fixed/Closed
(ARTEMIS-4963)
+3011041BasicSecurityTest.javahttps://github.com/apache/activemq-artemis/commit/d820c61e1a629178ee9e72bff3217813037da591'>11
+d820c612024/08/05
12:00:02Domenico Francesco BruscinoNO-JIRA Remove first
empty line from cherry-pick-report.sh
+001-1
+12
+07a79282024/08/05
13:51:43Clebert SuconicARTEMIS-4974 Dot
not allow run in the Shell executionMajor/Sub-task/Fixed/Closed
(ARTEMIS-4974)
+120012
+13
+49b1bd22024/08/05
16:30:25Clebert SuconicARTEMIS-4974
Removing 'dead' codeMajor/Sub-task/Fixed/Closed
(ARTEMIS-4974)
+009-9
+14
+be4995a2024/08/02
23:12:43Timothy BishARTEMIS-4969
Ensure AMQP senders can target FQQN if authorizedMajor/Bug/Fixed/Closed
(ARTEMIS-4969)
+101011AmqpTargetedFQQNSecurityTest.javahttps://github.com/apache/activemq-artemis/commit/5ab97653459fffd01931cc3ea3d08760125878a7'>15
+5ab97652024/08/06
11:55:58Clebert SuconicARTEMIS-4974
Removing Run from ShellMajor/Sub-task/Fixed/Closed
(ARTEMIS-4974)
+0413-9
+16
+14b68002024/07/08
19:49:38Erwin DondorpARTEMIS-4909 use
names that match original xml tagsMinor/Improvement/Fixed/Closed
(ARTEMIS-4909)
+0101
+17
+3ae4f2f2024/08/07
10:54:35Robbie GemmellARTEMIS-4976:
update to testcontainers 1.20.1Major/Dependency
upgrade/Fixed/Closed (ARTEMIS-4976)
+
+18
+4cc86ee2024/08/07
10:59:27Robbie GemmellARTEMIS-4977:
update to jgroups 5.3.10Major/Dependency
upgrade/Fixed/Closed (ARTEMIS-4977)
+
+19
+3f32e532024/08/08
06:49:16Robbie GemmellARTEMIS-4979:
update asciidoctorj-pdf to 2.3.18Minor/Dependency
upgrade/Fixed/Closed (ARTEMIS-4979)
+
+20
+b59dc422024/08/08
10:30:11Robbie GemmellARTEMIS-4980:
move sources jar creation to typical package phase, isolate to release
profilesMajor/Task/Fixed/Closed
(AR
svn commit: r70869 - /dev/activemq/activemq-artemis/2.37.0/
Author: clebertsuconic Date: Wed Aug 14 19:05:03 2024 New Revision: 70869 Log: release of 2.37.0 Added: dev/activemq/activemq-artemis/2.37.0/ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz (with props) dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.asc dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.sha512 dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip (with props) dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.asc dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.sha512 dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.tar.gz (with props) dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.tar.gz.asc dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.tar.gz.sha512 dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.zip (with props) dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.zip.asc dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.zip.sha512 Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.asc == --- dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.asc (added) +++ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.asc Wed Aug 14 19:05:03 2024 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQEzBAABCgAdFiEEKEF8leiQbRCDkoIjVKQ/MlSGhBAFAma8/AcACgkQVKQ/MlSG +hBDPwwgAuBwOt9IRZ6PpIF8IvRS1vM0ap7Kqa8pq75AHwh3TauqsBtfBpPlaxPNh +akj4PPgij4ThaomjUTv7p+A09nwWj/PoHYbi0Izw0E+J1ldfKYuxjQFHzrmt0+b2 +yajt+vgoihWZesrwm5N2tnOsH8su4rncOFOOzDzhHEZCgaMQszwTTp6XHfwbGnGq +5pav4k5B9YG8RKnKhpS9bELu5VkPqJjvDsp3fZfJSH5nGJ3d3m2LmOWy89194EDg +shlY0ly9f2Mq+S5PGwOvv3pDHP8BBLhbXKxq+gt6/xA2IY9tCAejNPjz+Jbc9KIv +L4vrNMzIYLvPnCFy4/NnNp0fnqdSSQ== +=tIyy +-END PGP SIGNATURE- Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.sha512 == --- dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.sha512 (added) +++ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.tar.gz.sha512 Wed Aug 14 19:05:03 2024 @@ -0,0 +1 @@ +ab4aed529fa4066d2ce67776231fe30e6c0a08e3e39f9f6ce69495d1ed5babdeef2454ade002755193cfda0666bd6d96e2e1dcfede33ee839727f0a7446c5403 apache-artemis-2.37.0-bin.tar.gz Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip == Binary file - no diff available. Propchange: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.asc == --- dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.asc (added) +++ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.asc Wed Aug 14 19:05:03 2024 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQEzBAABCgAdFiEEKEF8leiQbRCDkoIjVKQ/MlSGhBAFAma8/AcACgkQVKQ/MlSG +hBA29ggAskvKtnj6a6DxxWvZQPvDNzUaoVE71Bkon083GtrS23d6q41D+RSaosqV +Rqi0BkrwAeIQPD47ssL0uEkJBllVKLIiqx+k5nBbkZ9sk9EsFLzOL8no4sZd+ORf +bTMjvMy6iBqARjqmIzBDohbRrZU+IjI/Wkqh13IdyRGCHoGVazqi1Jol8py2UFx8 +8F1ShUqsoOZNE0B7FcxqLjekFGGq1lI/gDc6ribSyD3ppVmclrd3bApVyQ4VjHrN +IWlRxd91Xz2Z20G7pMEar0mtZMASAcZwKuH+dQt8T19qF+9L6q0Vk7e9Bw/wVEUc +aQoSN3NLH/Dbc9qwCWZ51vmaEa3E6w== +=ul0A +-END PGP SIGNATURE- Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.sha512 == --- dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.sha512 (added) +++ dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-bin.zip.sha512 Wed Aug 14 19:05:03 2024 @@ -0,0 +1 @@ +99d637ca3e71befb68559a72d47be82d32bcd8da10effc922443a572142804158a67cdbf28d34ee66a745c640a04550ff754f94bc4a51a2344a934c82874e3eb apache-artemis-2.37.0-bin.zip Added: dev/activemq/activemq-artemis/2.37.0/apache-artemis-2.37.0-source-release.tar.gz
(activemq-artemis) branch main updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 209f293922 [maven-release-plugin] prepare for next development iteration 209f293922 is described below commit 209f293922f0a385454f3ec55e6368191cbd0929 Author: Clebert Suconic AuthorDate: Wed Aug 14 14:39:34 2024 -0400 [maven-release-plugin] prepare for next development iteration --- artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 2 +- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-log-annotation-processor/tests/pom.xml | 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 6 +++--- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml | 2 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- tests/karaf
(activemq-artemis) annotated tag 2.37.0 created (now ba4da1ea11)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to annotated tag 2.37.0 in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git at ba4da1ea11 (tag) tagging de6efc82d1a79d76a63ea3a07bfb29e739634ff1 (commit) replaces 2.36.0 by Clebert Suconic on Wed Aug 14 14:39:28 2024 -0400 - Log - [maven-release-plugin] copy for tag 2.37.0 --- No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: [maven-release-plugin] prepare release 2.37.0
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new de6efc82d1 [maven-release-plugin] prepare release 2.37.0 de6efc82d1 is described below commit de6efc82d1a79d76a63ea3a07bfb29e739634ff1 Author: Clebert Suconic AuthorDate: Wed Aug 14 14:39:21 2024 -0400 [maven-release-plugin] prepare release 2.37.0 --- artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 2 +- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-log-annotation-processor/tests/pom.xml | 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 6 +++--- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml | 2 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- tests/karaf-client-integration-tests/pom.xml
svn commit: r70867 - in /dev/activemq/activemq-artemis: 2.36.0/ prepare-release.sh
Author: clebertsuconic
Date: Wed Aug 14 18:24:24 2024
New Revision: 70867
Log:
removing old release
Removed:
dev/activemq/activemq-artemis/2.36.0/
Modified:
dev/activemq/activemq-artemis/prepare-release.sh
Modified: dev/activemq/activemq-artemis/prepare-release.sh
==
--- dev/activemq/activemq-artemis/prepare-release.sh (original)
+++ dev/activemq/activemq-artemis/prepare-release.sh Wed Aug 14 18:24:24 2024
@@ -44,6 +44,8 @@ doDownload () {
echo "Downloading $completeURL"
curl $completeURL > $theFile
+ echo $completeURL.asc
+
echo "Downloading $theFile.asc"
curl $completeURL.asc > $theFile.asc
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4986 Allow configuring the target destination as well
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new fb7afa8ff3 ARTEMIS-4986 Allow configuring the target destination as
well
fb7afa8ff3 is described below
commit fb7afa8ff3f1851f4501f7b004f54082e5b483c3
Author: Clebert Suconic
AuthorDate: Tue Aug 13 21:58:00 2024 -0400
ARTEMIS-4986 Allow configuring the target destination as well
---
.../distribution/RollingUpgradeTest.java | 24 +-
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
index 1c6cf2870e..edac701ed4 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
@@ -181,24 +181,27 @@ public class RollingUpgradeTest extends
RealServerTestBase {
@Test
public void testRollUpgrade_2_30() throws Exception {
- testRollUpgrade(new File(TWO_THIRTY));
+ testRollUpgrade(new File(TWO_THIRTY), HelperBase.getHome());
}
@Test
public void testRollUpgrade_2_36() throws Exception {
- testRollUpgrade(new File(TWO_THIRTY_SIX));
+ testRollUpgrade(new File(TWO_THIRTY_SIX), HelperBase.getHome());
}
// Define a System Property TEST_ROLLED_DISTRIBUTION towards the Artemis
Home of your choice and this will
// perform the tests towards that distribution
+ // Define a System Property TEST_ROLLED_DISTRIBUTION_UPGRADE towards the
new Artemis home (by default the test will use BaseHelper.getHome()
@Test
public void testRollUpgrade_Provided_Distribution() throws Exception {
String distribution = TestParameters.testProperty("ROLLED",
"DISTRIBUTION", null);
assumeTrue(distribution != null);
- testRollUpgrade(new File(distribution));
+
+ String distributionUpgrading = TestParameters.testProperty("ROLLED",
"DISTRIBUTION_UPGRADE", HelperBase.getHome().getAbsolutePath());
+ testRollUpgrade(new File(distribution), new
File(distributionUpgrading));
}
- private void testRollUpgrade(File artemisHome) throws Exception {
+ private void testRollUpgrade(File artemisHome, File upgradingArtemisHome)
throws Exception {
assumeTrue(artemisHome.exists());
createServers(artemisHome);
@@ -246,15 +249,15 @@ public class RollingUpgradeTest extends
RealServerTestBase {
Pair updatedProcess;
- updatedProcess = rollUpgrade(0, LIVE_0, managementLive0, live0Process,
3, BKP_0, managementBKP0, bkp0Process);
+ updatedProcess = rollUpgrade(0, LIVE_0, managementLive0, live0Process,
3, BKP_0, managementBKP0, bkp0Process, upgradingArtemisHome);
this.live0Process = updatedProcess.getA();
this.bkp0Process = updatedProcess.getB();
- updatedProcess = rollUpgrade(1, LIVE_1, managementLive1, live1Process,
4, BKP_1, managementBKP1, bkp1Process);
+ updatedProcess = rollUpgrade(1, LIVE_1, managementLive1, live1Process,
4, BKP_1, managementBKP1, bkp1Process, upgradingArtemisHome);
this.live1Process = updatedProcess.getA();
this.bkp1Process = updatedProcess.getB();
- updatedProcess = rollUpgrade(2, LIVE_2, managementLive2, live2Process,
5, BKP_2, managementBKP2, bkp2Process);
+ updatedProcess = rollUpgrade(2, LIVE_2, managementLive2, live2Process,
5, BKP_2, managementBKP2, bkp2Process, upgradingArtemisHome);
this.live2Process = updatedProcess.getA();
this.bkp2Process = updatedProcess.getB();
@@ -306,7 +309,8 @@ public class RollingUpgradeTest extends RealServerTestBase {
int backupID,
String backupToStop,
SimpleManagement
backupManagement,
- Process backupProcess) throws
Exception {
+ Process backupProcess,
+ File targetRelease) throws
Exception {
logger.info("Stopping server {}", liveServerToStop);
stopServerWithFile(getServerLocation(liveServerToStop), liveProcess, 10,
TimeUnit.SECONDS);
@@ -316,7 +320,7 @@ public class RollingUpgradeTest extends RealServerTestBase {
ServerUtil.waitForServerToStart(backupID, 30_000);
logger.info("Upgrading {}", liveServerToStop);
- upgrade(HelperBase.getHome(), getFileSer
(activemq-artemis) branch main updated: ARTEMIS-4986 Changing plugin to compile phase to make it simpler on CI
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 5adde5ef43 ARTEMIS-4986 Changing plugin to compile phase to make it simpler on CI 5adde5ef43 is described below commit 5adde5ef4352c8af126ae64eaedb800649371381 Author: Clebert Suconic AuthorDate: Tue Aug 13 20:18:11 2024 -0400 ARTEMIS-4986 Changing plugin to compile phase to make it simpler on CI --- tests/compatibility-tests/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml index b5cfb1b199..e2b4d012b4 100644 --- a/tests/compatibility-tests/pom.xml +++ b/tests/compatibility-tests/pom.xml @@ -281,7 +281,7 @@ unpack-2.30.0 -package +compile unpack @@ -302,7 +302,7 @@ It will be important to test the switch at the current and previous version. --> unpack-2.36.0 -package +compile unpack - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 02/02: ARTEMIS-4986 incrementing version on activemq-version.properties
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 4cc43323bcff16396e99ed8527a789c611515896
Author: Clebert Suconic
AuthorDate: Tue Aug 13 16:07:16 2024 -0400
ARTEMIS-4986 incrementing version on activemq-version.properties
---
artemis-core-client/src/main/resources/activemq-version.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/artemis-core-client/src/main/resources/activemq-version.properties
b/artemis-core-client/src/main/resources/activemq-version.properties
index 8debcd3c3e..aaacbde788 100644
--- a/artemis-core-client/src/main/resources/activemq-version.properties
+++ b/artemis-core-client/src/main/resources/activemq-version.properties
@@ -20,4 +20,4 @@ activemq.version.minorVersion=${activemq.version.minorVersion}
activemq.version.microVersion=${activemq.version.microVersion}
activemq.version.incrementingVersion=${activemq.version.incrementingVersion}
activemq.version.versionTag=${activemq.version.versionTag}
-activemq.version.compatibleVersionList=121,122,123,124,125,126,127,128,129,130,131,132,133,134,135
+activemq.version.compatibleVersionList=121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated (537e0023fc -> 4cc43323bc)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 537e0023fc ARTEMIS-4986 Compatibility issue on Quorum Voting new 10b6ab9bd3 ARTEMIS-4986 Providing a test that will look for the distribution from a System Variable new 4cc43323bc ARTEMIS-4986 incrementing version on activemq-version.properties The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/activemq-version.properties | 2 +- .../tests/compatibility/distribution/RollingUpgradeTest.java | 10 ++ 2 files changed, 11 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 01/02: ARTEMIS-4986 Providing a test that will look for the distribution from a System Variable
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 10b6ab9bd3c10c202f566a4f0d55de3330e3edfe
Author: Clebert Suconic
AuthorDate: Tue Aug 13 15:47:44 2024 -0400
ARTEMIS-4986 Providing a test that will look for the distribution from a
System Variable
if you define TEST_ROLLED_DISTRIBUTION=your artemis home
testRollUpgrade_Provided_Distribution will execute the rolling upgrade from
that distribution
---
.../tests/compatibility/distribution/RollingUpgradeTest.java | 10 ++
1 file changed, 10 insertions(+)
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
index cdf4b39a8c..1c6cf2870e 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
@@ -35,6 +35,7 @@ import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.RealServerTestBase;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
+import org.apache.activemq.artemis.utils.TestParameters;
import org.apache.activemq.artemis.utils.Wait;
import org.apache.activemq.artemis.utils.cli.helper.HelperBase;
import org.junit.jupiter.api.Test;
@@ -188,6 +189,15 @@ public class RollingUpgradeTest extends RealServerTestBase
{
testRollUpgrade(new File(TWO_THIRTY_SIX));
}
+ // Define a System Property TEST_ROLLED_DISTRIBUTION towards the Artemis
Home of your choice and this will
+ // perform the tests towards that distribution
+ @Test
+ public void testRollUpgrade_Provided_Distribution() throws Exception {
+ String distribution = TestParameters.testProperty("ROLLED",
"DISTRIBUTION", null);
+ assumeTrue(distribution != null);
+ testRollUpgrade(new File(distribution));
+ }
+
private void testRollUpgrade(File artemisHome) throws Exception {
assumeTrue(artemisHome.exists());
createServers(artemisHome);
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4986 Compatibility issue on Quorum Voting
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 537e0023fc ARTEMIS-4986 Compatibility issue on Quorum Voting
537e0023fc is described below
commit 537e0023fc786ad947dc30c5d11c779749d0cbad
Author: Clebert Suconic
AuthorDate: Wed Aug 7 21:20:43 2024 -0400
ARTEMIS-4986 Compatibility issue on Quorum Voting
---
.../activemq/artemis/utils/SpawnedVMSupport.java | 19 +-
.../artemis/core/protocol/core/Channel.java| 10 +
.../core/protocol/core/impl/ChannelImpl.java | 28 +-
.../core/protocol/core/impl/PacketImpl.java| 2 +
.../core/impl/wireformat/QuorumVoteMessage.java| 4 +
.../artemis/core/server/ActiveMQServerLogger.java | 4 +-
.../core/server/cluster/quorum/QuorumManager.java | 77 -
.../core/server/cluster/quorum/QuorumVote.java | 11 +-
.../cluster/quorum/QuorumVoteServerConnect.java| 7 +-
.../core/server/impl/ColocatedActivation.java | 3 +-
pom.xml| 2 +-
.../activemq/artemis/utils/RealServerTestBase.java | 6 +
.../artemis/utils/cli/helper/HelperBase.java | 31 +-
tests/compatibility-tests/pom.xml | 59
.../distribution/RollingUpgradeTest.java | 354 +
.../integration/cluster/util/BackupSyncDelay.java | 10 +-
16 files changed, 592 insertions(+), 35 deletions(-)
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
index 393682d03f..2cb8bbab2c 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java
@@ -221,17 +221,26 @@ public class SpawnedVMSupport {
Process process = builder.start();
+ spawnLoggers(wordMatch, wordRunning, className, logOutput,
logErrorOutput, process);
+
+ if (startedProcesses != null) {
+ startedProcesses.put(process, className);
+ }
+ return process;
+ }
+
+ public static void spawnLoggers(String wordMatch,
+ Runnable wordRunning,
+ String className,
+ boolean logOutput,
+ boolean logErrorOutput,
+ Process process) throws
ClassNotFoundException {
SpawnedVMSupport.startLogger(logOutput, wordMatch, wordRunning,
className, process);
// Adding a reader to System.err, so the VM won't hang on a
System.err.println as identified on this forum thread:
// http://www.jboss.org/index.html?module=bb&op=viewtopic&t=151815
ProcessLogger errorLogger = new ProcessLogger(logErrorOutput,
process.getErrorStream(), className, wordMatch, wordRunning);
errorLogger.start();
-
- if (startedProcesses != null) {
- startedProcesses.put(process, className);
- }
- return process;
}
/**
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
index 12817294c6..d8785952c5 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
@@ -57,6 +57,14 @@ public interface Channel {
*/
boolean supports(byte packetID, int version);
+ /*
+* Due to ARTEMIS-4986, older versions (2.30.0 in particular) will require
a special voting handling,
+* where we would perform specific retries at older values.
+*/
+ default boolean requireSpecialVotingHandling() {
+ return false;
+ }
+
/**
* Sends a packet on this channel.
*
@@ -134,6 +142,8 @@ public interface Channel {
*/
Packet sendBlocking(Packet packet, int reconnectID, byte expectedPacket)
throws ActiveMQException;
+ Packet sendBlocking(Packet packet, int reconnectID, byte expectedPacket,
long timeout, boolean failOnTimeout) throws ActiveMQException;
+
/**
* Sets the {@link
org.apache.activemq.artemis.core.protocol.core.ChannelHandler} that this
channel should
* forward received packets to.
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
index 4f8e17f5b0..e33d603ffa 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
+++
b
(activemq-artemis) branch main updated: ARTEMIS-4974 Removing 'dead' code
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 49b1bd26ad ARTEMIS-4974 Removing 'dead' code
49b1bd26ad is described below
commit 49b1bd26add0fcbd21d291df396b0bf1a8837415
Author: Clebert Suconic
AuthorDate: Mon Aug 5 16:30:25 2024 -0400
ARTEMIS-4974 Removing 'dead' code
Since we now disable run from the Shell, this code I'm removing would be
"dead code"
---
.../main/java/org/apache/activemq/artemis/cli/commands/Run.java | 9 -
1 file changed, 9 deletions(-)
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
index 6a4826f8fe..9588e2d358 100644
---
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
+++
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
@@ -168,15 +168,6 @@ public class Run extends LockAbstract {
return serverActivationFailed.get();
}
- if (Shell.inShell()) {
- while (server.getServer().isStarted()) {
-try {
- Thread.sleep(1000);
-} catch (InterruptedException ignored) {
-}
- }
- }
-
return new Pair<>(managementContext, server.getServer());
}
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4974 Dot not allow run in the Shell execution
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 07a7928483 ARTEMIS-4974 Dot not allow run in the Shell execution
07a7928483 is described below
commit 07a7928483ffcbcf2582e3e3e1a6544ebdbce61a
Author: Clebert Suconic
AuthorDate: Mon Aug 5 13:51:43 2024 -0400
ARTEMIS-4974 Dot not allow run in the Shell execution
---
.../java/org/apache/activemq/artemis/cli/commands/Run.java | 12
1 file changed, 12 insertions(+)
diff --git
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
index 219a581306..6a4826f8fe 100644
---
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
+++
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
@@ -25,6 +25,7 @@ import
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.cli.Artemis;
import org.apache.activemq.artemis.cli.Shell;
+import org.apache.activemq.artemis.cli.Terminal;
import org.apache.activemq.artemis.cli.commands.tools.LockAbstract;
import org.apache.activemq.artemis.cli.factory.BrokerFactory;
import org.apache.activemq.artemis.cli.factory.jmx.ManagementFactory;
@@ -75,6 +76,17 @@ public class Run extends LockAbstract {
@Override
public Object execute(ActionContext context) throws Exception {
+
+ if (Shell.inShell()) {
+
+ String scriptStart = "./artemis";
+ if (System.getProperty("os.name",
"linux").toLowerCase().trim().startsWith("win")) {
+scriptStart = "artemis.cmd";
+ }
+ System.out.println(Terminal.RED_UNICODE + "ERROR: The run command is
not supported in the artemis shell. Please use '" + scriptStart + " run'
directly." + Terminal.CLEAR_UNICODE);
+ return null;
+ }
+
super.execute(context);
verifyOlderLogging(new File(getBrokerEtc()));
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated (8250e611df -> d820c61e1a)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 8250e611df ARTEMIS-4963 Check send auth on openwire producer create add d820c61e1a NO-JIRA Remove first empty line from cherry-pick-report.sh No new revisions were added by this update. Summary of changes: scripts/cherry-pick-report.sh | 1 - 1 file changed, 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4964 Fast ACK Test with Mirror
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 47acdc4517 ARTEMIS-4964 Fast ACK Test with Mirror
47acdc4517 is described below
commit 47acdc451703f4e6ace1dd380e7a298b3aa73d57
Author: Clebert Suconic
AuthorDate: Thu Aug 1 23:07:39 2024 -0400
ARTEMIS-4964 Fast ACK Test with Mirror
One side of the mirror will send and ack messages one by one.
As the message arrives in the mirror the ack comes before the persistence
finishes, so we need to retry and configure retry accordingly.
---
.../mirror/QuickAckMirrorTest.java | 182 +
1 file changed, 182 insertions(+)
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/QuickAckMirrorTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/QuickAckMirrorTest.java
new file mode 100644
index 00..8c5a9b4a82
--- /dev/null
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/QuickAckMirrorTest.java
@@ -0,0 +1,182 @@
+/*
+ * 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.
+ */
+
+package org.apache.activemq.artemis.tests.soak.brokerConnection.mirror;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+import java.util.Properties;
+
+import org.apache.activemq.artemis.api.core.management.SimpleManagement;
+import
org.apache.activemq.artemis.core.config.amqpBrokerConnectivity.AMQPBrokerConnectionAddressType;
+import org.apache.activemq.artemis.tests.soak.SoakTestBase;
+import org.apache.activemq.artemis.tests.util.CFUtil;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
+import org.apache.activemq.artemis.util.ServerUtil;
+import org.apache.activemq.artemis.utils.FileUtil;
+import org.apache.activemq.artemis.utils.Wait;
+import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class QuickAckMirrorTest extends SoakTestBase {
+
+ private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ private static final String QUEUE_NAME = "myQueue";
+
+ public static final String DC1_NODE_A = "ImmediateAckIdempotentTest/DC1";
+ public static final String DC2_NODE_A = "ImmediateAckIdempotentTest/DC2";
+
+ Process processDC1_node_A;
+ Process processDC2_node_A;
+
+ private static String DC1_NODEA_URI = "tcp://localhost:61616";
+ private static String DC2_NODEA_URI = "tcp://localhost:61618";
+
+ private static void createServer(String serverName,
+String connectionName,
+String mirrorURI,
+int porOffset) throws Exception {
+ File serverLocation = getFileServerLocation(serverName);
+ deleteDirectory(serverLocation);
+
+ HelperCreate cliCreateServer = new HelperCreate();
+
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
+ cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
+ cliCreateServer.setClustered(false);
+ cliCreateServer.setNoWeb(true);
+ cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE_A);
+ cliCreateServer.addArgs("--queues", QUEUE_NAME);
+ cliCreateServer.setPortOffset(porOffset);
+ cliCreateServ
(activemq-artemis) branch openWireTest deleted (was d177c8539d)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch openWireTest in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git was d177c8539d ARTEMIS-X Expanding tests towards OpenWire This change permanently discards the following revisions: discard d177c8539d ARTEMIS-X Expanding tests towards OpenWire - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch openWireTest created (now d177c8539d)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch openWireTest in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git at d177c8539d ARTEMIS-X Expanding tests towards OpenWire This branch includes the following new commits: new d177c8539d ARTEMIS-X Expanding tests towards OpenWire The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 01/01: ARTEMIS-X Expanding tests towards OpenWire
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch openWireTest
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit d177c8539def65ec0576f22bd2ec33b0e82a0be1
Author: Clebert Suconic
AuthorDate: Wed Jul 31 13:59:03 2024 -0400
ARTEMIS-X Expanding tests towards OpenWire
---
.../brokerConnection/DivertQueueMirrorTest.java| 4 ++
.../mirror/AccumulatedInPageSoakTest.java | 17 --
.../mirror/ClusteredMirrorSoakTest.java| 65 +-
.../brokerConnection/mirror/IdempotentACKTest.java | 8 ++-
.../mirror/ReplicatedBothNodesMirrorTest.java | 40 +
.../mirror/ReplicatedMirrorTargetTest.java | 13 -
.../mirror/SingleMirrorSoakTest.java | 16 +-
7 files changed, 129 insertions(+), 34 deletions(-)
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
index e7c86a6b65..d1e67f1567 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
@@ -130,6 +130,10 @@ public class DivertQueueMirrorTest extends SmokeTestBase {
@Test
@Timeout(value = 240_000L, unit = TimeUnit.MILLISECONDS)
public void testDivertAndMirror() throws Exception {
+ testDivertAndMirror("AMQP");
+
+ }
+ public void testDivertAndMirror(String protocol) throws Exception {
String protocol = "AMQP"; // no need to run this test using multiple
protocols. this is about validating paging works correctly
processDC1_node_A = startServer(DC1_NODE_A, -1, -1, new
File(getServerLocation(DC1_NODE_A), "broker.properties"));
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java
index 568c25df28..181381f13a 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java
@@ -124,16 +124,22 @@ public class AccumulatedInPageSoakTest extends
SoakTestBase {
@Test
@Timeout(value = 240_000L, unit = TimeUnit.MILLISECONDS)
- public void testAccumulateWhileMirrorDown() throws Exception {
- String protocol = "AMQP"; // no need to run this test using multiple
protocols. this is about validating paging works correctly
+ public void testAccumulateWhileMirrorDownOpenWire() throws Exception {
+ testAccumulateWhileMirrorDown("OPENWIRE", 20_000, 100);
+ }
+
+ @Test
+ @Timeout(value = 240_000L, unit = TimeUnit.MILLISECONDS)
+ public void testAccumulateWhileMirrorDownAMQP() throws Exception {
+ testAccumulateWhileMirrorDown("AMQP", 20_000, 1000);
+ }
+
+ private void testAccumulateWhileMirrorDown(String protocol, final int
numberOfMessages, final int commitInterval) throws Exception {
startDC1();
ExecutorService service = Executors.newFixedThreadPool(1);
runAfter(service::shutdownNow);
- final int numberOfMessages = 20_000;
- final int commitInterval = 1000;
-
ConnectionFactory connectionFactoryDC1A =
CFUtil.createConnectionFactory(protocol, DC1_NODEA_URI);
ConnectionFactory connectionFactoryDC2A =
CFUtil.createConnectionFactory(protocol, DC2_NODEA_URI);
@@ -163,6 +169,7 @@ public class AccumulatedInPageSoakTest extends SoakTestBase
{
} catch (Throwable e) {
logger.warn(e.getMessage(), e);
errors.incrementAndGet();
+System.exit(-1);
} finally {
done.countDown();
}
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
index ad4191fe28..0215d09690 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
@@ -147,7 +147,17 @@ public class ClusteredMirrorSoakTest extends SoakTestBase {
}
@Test
- public void testAvoidReflections() throws Exception {
+ public void testAvoidReflectionsAMQP() throws Exception {
+ tes
(activemq-artemis) branch main updated: NO-JIRA tweak on DivertQueueMirrorTest
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new d7078cabf5 NO-JIRA tweak on DivertQueueMirrorTest
d7078cabf5 is described below
commit d7078cabf51b5198e6e0e098245f25eacfe44bb1
Author: Clebert Suconic
AuthorDate: Tue Jul 30 20:44:01 2024 -0400
NO-JIRA tweak on DivertQueueMirrorTest
---
.../artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
index 6a6428d0f8..e7c86a6b65 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
@@ -44,7 +44,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.jupiter.api.Assertions.assertTrue;
public class DivertQueueMirrorTest extends SmokeTestBase {
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: NO-JIRA Mirror and Divert Smoke Test
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new cbbaa7a8e0 NO-JIRA Mirror and Divert Smoke Test
cbbaa7a8e0 is described below
commit cbbaa7a8e0ff37712c422544226fe69ba0ee076f
Author: Clebert Suconic
AuthorDate: Tue Jul 30 20:11:13 2024 -0400
NO-JIRA Mirror and Divert Smoke Test
I was doing some verification with Diverts and Mirror in the form of a
smoke test.
no issue found but I'm keeping the test.
---
.../brokerConnection/DivertQueueMirrorTest.java| 202 +
1 file changed, 202 insertions(+)
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
new file mode 100644
index 00..6a6428d0f8
--- /dev/null
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
@@ -0,0 +1,202 @@
+/*
+ * 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.
+ */
+
+package org.apache.activemq.artemis.tests.smoke.brokerConnection;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import java.io.File;
+import java.io.StringWriter;
+import java.lang.invoke.MethodHandles;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.activemq.artemis.api.core.management.SimpleManagement;
+import
org.apache.activemq.artemis.core.config.amqpBrokerConnectivity.AMQPBrokerConnectionAddressType;
+import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
+import org.apache.activemq.artemis.tests.util.CFUtil;
+import org.apache.activemq.artemis.util.ServerUtil;
+import org.apache.activemq.artemis.utils.Wait;
+import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DivertQueueMirrorTest extends SmokeTestBase {
+
+ private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+ private static String body;
+
+ static {
+ StringWriter writer = new StringWriter();
+ while (writer.getBuffer().length() < 20 * 1024) {
+ writer.append("This is a string . ");
+ }
+ body = writer.toString();
+ }
+
+ private static final String CREATE_QUEUE = "outQueue1,outQueue2";
+
+ public static final String DC1_NODE_A = "DivertQueueMirrorTest/DC1";
+ public static final String DC2_NODE_A = "DivertQueueMirrorTest/DC2";
+
+ private static final String SNF_QUEUE = "$ACTIVEMQ_ARTEMIS_MIRROR_mirror";
+
+ Process processDC1_node_A;
+ Process processDC2_node_A;
+
+ private static String DC1_NODEA_URI = "tcp://localhost:61616";
+ private static String DC2_NODEA_URI = "tcp://localhost:61618";
+
+ private static void createServer(String serverName,
+String connectionName,
+String mirrorURI,
+int porOffset) throws Exception {
+ File serverLocation = getFileServerLocation(serverName);
+ deleteDirectory(serverLocation);
+
+ HelperCreate cliCreateServer = new HelperCreate();
+
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
+ cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
+ cliCreateServer.setClustered(false);
+ cliCreateServer.setNoWeb(false);
+ cliCreateServer.setArgs(&
(activemq-artemis) branch main updated: ARTEMIS-4959 moveMessages operation can move more messages than max messageCount
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 4ce0dfca2d ARTEMIS-4959 moveMessages operation can move more messages
than max messageCount
4ce0dfca2d is described below
commit 4ce0dfca2d3dcd47a456d77df79ed63790950a9b
Author: Howard Gao
AuthorDate: Mon Jul 29 21:09:48 2024 +0800
ARTEMIS-4959 moveMessages operation can move more messages than max
messageCount
---
.../core/management/impl/QueueControlImpl.java | 4 ++
.../artemis/core/server/impl/QueueImpl.java| 42 +---
.../artemis/tests/util/ActiveMQTestBase.java | 31
.../integration/management/QueueControlTest.java | 58 ++
.../tests/integration/paging/PagingSendTest.java | 35 -
5 files changed, 116 insertions(+), 54 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index e3a054a436..86988c1c6c 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -1382,6 +1382,10 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
final int messageCount) throws Exception {
// this is a critical task, we need to prevent parallel tasks running
try (AutoCloseable lock = server.managementLock()) {
+ if (this.queue.getName().toString().equals(otherQueueName)) {
+//doesn't make sense to move messages to itself
+throw new IllegalArgumentException("Cannot move messages onto
itself");
+ }
if (AuditLogger.isBaseLoggingEnabled()) {
AuditLogger.moveMessages(queue, flushLimit, filterStr,
otherQueueName, rejectDuplicates, messageCount);
}
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 249c7e44a9..720ebd1f06 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -2280,7 +2280,6 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
QueueIterateAction messageAction) throws
Exception {
int count = 0;
int txCount = 0;
- Integer expectedHits = messageAction.expectedHits();
// This is to avoid scheduling depaging while iterQueue is happening
// this should minimize the use of the paged executor.
depagePending = true;
@@ -2296,7 +2295,7 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
try (LinkedListIterator iter = iterator()) {
- while (iter.hasNext()) {
+ while (iter.hasNext() &&
!messageAction.expectedHitsReached(count)) {
MessageReference ref = iter.next();
if (filter1 == null || filter1.match(ref.getMessage())) {
@@ -2306,9 +2305,6 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
}
txCount++;
count++;
- if (expectedHits != null && count >=
expectedHits.intValue()) {
-break;
- }
}
}
@@ -2320,11 +2316,18 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
txCount = 0;
}
+ if (messageAction.expectedHitsReached(count)) {
+ return count;
+ }
+
List cancelled =
scheduledDeliveryHandler.cancel(ref -> filter1 == null ? true :
filter1.match(ref.getMessage()));
for (MessageReference messageReference : cancelled) {
messageAction.actMessage(tx, messageReference);
count++;
txCount++;
+ if (messageAction.expectedHitsReached(count)) {
+ break;
+ }
}
if (txCount > 0) {
@@ -2336,7 +2339,7 @@ public class QueueImpl extends CriticalComponentImpl
implements Queue {
}
if (pageIterator != null) {
-while (pageIterator.hasNext()) {
+while (pageIterator.hasNext() &&
!messageAction.expectedHitsReached(count)) {
svn commit: r70620 - in /release/activemq/activemq-artemis: 2.34.0/ 2.35.0/
Author: clebertsuconic Date: Tue Jul 30 01:20:06 2024 New Revision: 70620 Log: removing older releases Removed: release/activemq/activemq-artemis/2.34.0/ release/activemq/activemq-artemis/2.35.0/ - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis-examples) branch main updated (e76a51d -> 70f30ed)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git from e76a51d Update examples to version 2.35.0 add 0c29740 Update examples to version 2.36.0-SNAPSHOT add c1857ab ARTEMIS-4873 Add an example showing AMQP federation in pull mode add c6ce244 have the release helper script create a tag that can be pushed add c5d2ab6 only build on push to branches, avoid duplicate runs add bc86b5d ARTEMIS-4873: tweak example to avoid potential NPE from race between creating new backlog and replenishing credit add 70f30ed Update examples to version 2.36.0 No new revisions were added by this update. Summary of changes: .github/workflows/build.yml| 2 + artemis-distribution/pom.xml | 2 +- .../amqp-federation-multicast-fanout/pom.xml | 2 +- .../amqp-federation-multicast-hub-spoke/pom.xml| 2 +- .../amqp-federation-multicast-ring/pom.xml | 2 +- .../amqp-federation-over-ssl/pom.xml | 2 +- .../amqp-federation-queue-dual-federation/pom.xml | 2 +- .../amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../amqp-federation-queue-priority/pom.xml | 2 +- .../pom.xml| 34 +++ .../readme.md | 4 +- .../jms/example/BrokerFederationExample.java | 113 + .../src/main/resources/activemq/server1/broker.xml | 2 + .../main/resources/activemq/server2}/broker.xml| 4 +- .../broker-connection/amqp-federation/pom.xml | 2 +- .../amqp-receiving-messages/pom.xml| 2 +- .../amqp-sending-messages-multicast/pom.xml| 2 +- .../amqp-sending-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-overssl/pom.xml | 2 +- .../broker-connection/disaster-recovery/pom.xml| 2 +- examples/features/broker-connection/pom.xml| 4 +- .../clustered/client-side-load-balancing/pom.xml | 2 +- .../clustered-durable-subscription/pom.xml | 2 +- .../features/clustered/clustered-grouping/pom.xml | 2 +- .../features/clustered/clustered-jgroups/pom.xml | 2 +- .../features/clustered/clustered-queue/pom.xml | 2 +- .../clustered-static-discovery-uri/pom.xml | 2 +- .../clustered/clustered-static-discovery/pom.xml | 2 +- .../clustered/clustered-static-oneway/pom.xml | 2 +- .../features/clustered/clustered-topic-uri/pom.xml | 2 +- .../features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml| 2 +- .../clustered/queue-message-redistribution/pom.xml | 2 +- .../shared-storage-static-cluster/pom.xml | 2 +- .../features/clustered/symmetric-cluster/pom.xml | 2 +- .../connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml| 2 +- .../connection-router/symmetric-redirect/pom.xml | 2 +- .../connection-router/symmetric-simple/pom.xml | 2 +- .../federation/federated-address-divert/pom.xml| 2 +- .../federated-address-downstream-upstream/pom.xml | 2 +- .../federated-address-downstream/pom.xml | 2 +- .../features/federation/federated-address/pom.xml | 2 +- .../federated-queue-downstream-upstream/pom.xml| 2 +- .../federation/federated-queue-downstream/pom.xml | 2 +- .../features/federation/federated-queue/pom.xml| 2 +- examples/features/federation/pom.xml | 2 +- .../features/ha/application-layer-failover/pom.xml | 2 +- .../ha/client-side-failoverlistener/pom.xml| 2 +- .../ha/colocated-failover-scale-down/pom.xml | 2 +- examples/features/ha/colocated-failover/pom.xml| 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- .../features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml | 2 +- .../features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- .../features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- .../ha/replicated-multiple-failover/pom.xml| 2 +- .../ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml| 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- .../ha/zookeeper-single-pair-failback/pom.xml | 2 +- examples/features/perf/perf/pom.xml| 2 +- examples/features/perf/pom.xml | 2 +- examples/features/perf/soak/pom.xml| 2 +- examples/features/pom.xml | 2 +- examples/features/standard
(activemq-artemis-examples) annotated tag 2.36.0 created (now 66e4d27)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to annotated tag 2.36.0 in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git at 66e4d27 (tag) tagging 70f30ed2466dec141db963832482c1e66914ac4a (commit) replaces 2.35.0 by Clebert Suconic on Mon Jul 29 13:50:36 2024 -0400 - Log - Update examples to version 2.36.0 --- No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis-examples) 02/02: Update examples to version 2.37.0-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git commit 14da7deabf197cf0b37963dcaaa1c8d70958 Author: Clebert Suconic AuthorDate: Mon Jul 29 13:50:52 2024 -0400 Update examples to version 2.37.0-SNAPSHOT --- artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- examples/features/broker-connection/amqp-federation-over-ssl/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-pull-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml | 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- examples/features/ha/zookeeper-single-pair-failback/pom.xml | 2 +- examples/features/perf
(activemq-artemis-examples) 01/02: Update examples to version 2.36.0
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git commit 70f30ed2466dec141db963832482c1e66914ac4a Author: Clebert Suconic AuthorDate: Mon Jul 29 13:50:36 2024 -0400 Update examples to version 2.36.0 --- artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- examples/features/broker-connection/amqp-federation-over-ssl/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-pull-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/pom.xml | 2 +- examples/features/ha/scale-down/pom.xml | 2 +- examples/features/ha/stop-server-failover/pom.xml | 2 +- examples/features/ha/transaction-failover/pom.xml | 2 +- examples/features/ha/zookeeper-single-pair-failback/pom.xml | 2 +- examples/features/perf/perf
(activemq-artemis-examples) branch development updated (bc86b5d -> 14da222)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/activemq-artemis-examples.git from bc86b5d ARTEMIS-4873: tweak example to avoid potential NPE from race between creating new backlog and replenishing credit new 70f30ed Update examples to version 2.36.0 new 14da222 Update examples to version 2.37.0-SNAPSHOT The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: artemis-distribution/pom.xml | 2 +- .../broker-connection/amqp-federation-multicast-fanout/pom.xml| 2 +- .../broker-connection/amqp-federation-multicast-hub-spoke/pom.xml | 2 +- .../features/broker-connection/amqp-federation-multicast-ring/pom.xml | 2 +- examples/features/broker-connection/amqp-federation-over-ssl/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-dual-federation/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-multiple-brokers/pom.xml | 2 +- .../features/broker-connection/amqp-federation-queue-priority/pom.xml | 2 +- .../broker-connection/amqp-federation-queue-pull-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-federation/pom.xml | 2 +- examples/features/broker-connection/amqp-receiving-messages/pom.xml | 2 +- .../broker-connection/amqp-sending-messages-multicast/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-messages/pom.xml | 2 +- examples/features/broker-connection/amqp-sending-overssl/pom.xml | 2 +- examples/features/broker-connection/disaster-recovery/pom.xml | 2 +- examples/features/broker-connection/pom.xml | 2 +- examples/features/clustered/client-side-load-balancing/pom.xml| 2 +- examples/features/clustered/clustered-durable-subscription/pom.xml| 2 +- examples/features/clustered/clustered-grouping/pom.xml| 2 +- examples/features/clustered/clustered-jgroups/pom.xml | 2 +- examples/features/clustered/clustered-queue/pom.xml | 2 +- examples/features/clustered/clustered-static-discovery-uri/pom.xml| 2 +- examples/features/clustered/clustered-static-discovery/pom.xml| 2 +- examples/features/clustered/clustered-static-oneway/pom.xml | 2 +- examples/features/clustered/clustered-topic-uri/pom.xml | 2 +- examples/features/clustered/clustered-topic/pom.xml | 2 +- examples/features/clustered/pom.xml | 2 +- examples/features/clustered/queue-message-redistribution/pom.xml | 2 +- examples/features/clustered/shared-storage-static-cluster/pom.xml | 2 +- examples/features/clustered/symmetric-cluster/pom.xml | 2 +- examples/features/connection-router/evenly-redirect/pom.xml | 2 +- examples/features/connection-router/pom.xml | 2 +- examples/features/connection-router/symmetric-redirect/pom.xml| 2 +- examples/features/connection-router/symmetric-simple/pom.xml | 2 +- examples/features/federation/federated-address-divert/pom.xml | 2 +- .../features/federation/federated-address-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-address-downstream/pom.xml | 2 +- examples/features/federation/federated-address/pom.xml| 2 +- .../features/federation/federated-queue-downstream-upstream/pom.xml | 2 +- examples/features/federation/federated-queue-downstream/pom.xml | 2 +- examples/features/federation/federated-queue/pom.xml | 2 +- examples/features/federation/pom.xml | 2 +- examples/features/ha/application-layer-failover/pom.xml | 2 +- examples/features/ha/client-side-failoverlistener/pom.xml | 2 +- examples/features/ha/colocated-failover-scale-down/pom.xml| 2 +- examples/features/ha/colocated-failover/pom.xml | 2 +- examples/features/ha/ha-policy-autobackup/pom.xml | 2 +- examples/features/ha/multiple-failover-failback/pom.xml | 2 +- examples/features/ha/multiple-failover/pom.xml| 2 +- examples/features/ha/non-transaction-failover/pom.xml | 2 +- examples/features/ha/pom.xml | 2 +- examples/features/ha/replicated-failback-static/pom.xml | 2 +- examples/features/ha/replicated-failback/pom.xml | 2 +- examples/features/ha/replicated-multiple-failover/pom.xml | 2 +- examples/features/ha/replicated-transaction-failover/
(activemq-website) branch main updated: Update description on artemis 2.36.0
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-website.git The following commit(s) were added to refs/heads/main by this push: new e8a9fc55d Update description on artemis 2.36.0 e8a9fc55d is described below commit e8a9fc55dd0da1fb37a386a685cd765fa18d1ff1 Author: Clebert Suconic AuthorDate: Mon Jul 29 12:11:10 2024 -0400 Update description on artemis 2.36.0 --- src/_artemis_releases/artemis-02-36-00.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_artemis_releases/artemis-02-36-00.md b/src/_artemis_releases/artemis-02-36-00.md index 17b792718..d34db3ced 100644 --- a/src/_artemis_releases/artemis-02-36-00.md +++ b/src/_artemis_releases/artemis-02-36-00.md @@ -2,7 +2,7 @@ version: 2.36.0 release_date: 2024-07-29 title: ActiveMQ Artemis 2.36.0 -shortDescription: Dependency updates, Bug fixes including Stability improvement on Journal NIO, and concurrency issue with Stomp processing. +shortDescription: Stability improvement on Journal NIO, concurrency issue with Stomp processing, bug fixes and version upgrades. # Docs subdir name for past-releases and previous-docs pages, 'latest' is always used on the main download page. docs_version: 2.36.0 java_version: 11+ - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
svn commit: r70610 - /release/activemq/activemq-artemis/2.36.0/
Author: clebertsuconic Date: Mon Jul 29 15:56:24 2024 New Revision: 70610 Log: add files for activemq-artemis-2.36.0 Added: release/activemq/activemq-artemis/2.36.0/ - copied from r70609, dev/activemq/activemq-artemis/2.36.0/ - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4952 Use getObjectPropertyForFilter when applying filters
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 284ce80618 ARTEMIS-4952 Use getObjectPropertyForFilter when applying
filters
284ce80618 is described below
commit 284ce806186527a29185b2ccefd1c2187ee86ac8
Author: Timothy Bish
AuthorDate: Thu Jul 25 13:47:10 2024 -0400
ARTEMIS-4952 Use getObjectPropertyForFilter when applying filters
When counting messages with provided filters and grouping use the API
getObjectPropertyForFilter which translates values from AMQP message
annotations that are otherwise missed by the filters.
---
.../core/management/impl/QueueControlImpl.java | 2 +-
.../tests/integration/amqp/JMXManagementTest.java | 61 ++
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index 2a010017c1..e3a054a436 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -1161,7 +1161,7 @@ public class QueueControlImpl extends AbstractControl
implements QueueControl {
if (groupByProperty == null) {
result.compute(null, (k, v) -> v == null ? 1 : ++v);
} else {
-Object value = message.getObjectProperty(groupByProperty);
+Object value = message.getObjectPropertyForFilter(groupByProperty);
String valueStr = value == null ? null : value.toString();
result.compute(valueStr, (k, v) -> v == null ? 1 : ++v);
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMXManagementTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMXManagementTest.java
index 4e4606272f..7e1677baaa 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMXManagementTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMXManagementTest.java
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.activemq.artemis.api.core.JsonUtil;
+import org.apache.activemq.artemis.api.core.QueueConfiguration;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.management.QueueControl;
@@ -242,6 +243,66 @@ public class JMXManagementTest extends
JMSClientTestSupport {
}
}
+ @Test
+ public void testCountMessagesWithOriginalQueueFilter() throws Exception {
+ final String queueA = getQueueName();
+ final String queueB = getQueueName() + "_B";
+ final String queueC = getQueueName() + "_C";
+ final QueueControl queueAControl = createManagementControl(queueA);
+ final QueueControl queueBControl = createManagementControl(queueB);
+ final QueueControl queueCControl = createManagementControl(queueC);
+ final int MESSAGE_COUNT = 20;
+
+
server.createQueue(QueueConfiguration.of(queueB).setAddress(queueB).setRoutingType(RoutingType.ANYCAST));
+
server.createQueue(QueueConfiguration.of(queueC).setAddress(queueC).setRoutingType(RoutingType.ANYCAST));
+
+ AmqpClient client = createAmqpClient();
+ AmqpConnection connection = addConnection(client.connect());
+
+ try {
+ AmqpSession session = connection.createSession();
+ AmqpSender senderA = session.createSender(queueA.toString());
+ AmqpSender senderB = session.createSender(queueB.toString());
+
+ for (int i = 0; i < MESSAGE_COUNT; i++) {
+final AmqpMessage message = new AmqpMessage();
+message.setText("Message number: " + i);
+
+senderA.send(message);
+senderB.send(message);
+ }
+
+ assertEquals(MESSAGE_COUNT, queueAControl.countMessages());
+ assertEquals(MESSAGE_COUNT, queueBControl.countMessages());
+ assertEquals(0, queueCControl.countMessages());
+
+ queueAControl.moveMessages(null, queueC);
+ queueBControl.moveMessages(null, queueC);
+
+ assertEquals(0, queueAControl.countMessages());
+ assertEquals(0, queueBControl.countMessages());
+ assertEquals(MESSAGE_COUNT * 2, queueCControl.countMessages());
+
+ final String originalGroup = queueCControl.countMessages(null,
"_AMQ_ORIG_QUE
(activemq-artemis) branch main updated: ARTEMIS-4954 AddressControl.pause() can pause the snf queue
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 096a869c1e ARTEMIS-4954 AddressControl.pause() can pause the snf queue
096a869c1e is described below
commit 096a869c1ed6102a43074434db07899c70231c4a
Author: Howard Gao
AuthorDate: Thu Jul 25 22:50:14 2024 +0800
ARTEMIS-4954 AddressControl.pause() can pause the snf queue
---
.../artemis/core/server/impl/AddressInfo.java | 14 +--
.../bridge/ClusteredBridgeReconnectTest.java | 107 +
2 files changed, 114 insertions(+), 7 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
index 44942f5e9a..e35a30828c 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.core.server.impl;
+import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
import org.apache.activemq.artemis.json.JsonArray;
import org.apache.activemq.artemis.json.JsonArrayBuilder;
import org.apache.activemq.artemis.json.JsonNumber;
@@ -35,7 +36,6 @@ import
org.apache.activemq.artemis.core.persistence.StorageManager;
import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.postoffice.Bindings;
import org.apache.activemq.artemis.core.postoffice.PostOffice;
-import org.apache.activemq.artemis.core.postoffice.QueueBinding;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
import
org.apache.activemq.artemis.core.settings.HierarchicalRepositoryChangeListener;
import org.apache.activemq.artemis.utils.CompositeAddress;
@@ -216,8 +216,8 @@ public class AddressInfo {
Bindings bindings =
postOffice.lookupBindingsForAddress(this.getName());
if (bindings != null) {
for (Binding binding : bindings.getBindings()) {
- if (binding instanceof QueueBinding) {
- ((QueueBinding) binding).getQueue().pause(false);
+ if (binding instanceof LocalQueueBinding) {
+ ((LocalQueueBinding) binding).getQueue().pause(false);
}
}
}
@@ -250,8 +250,8 @@ public class AddressInfo {
Bindings bindings =
postOffice.lookupBindingsForAddress(this.getName());
if (bindings != null) {
for (Binding binding : bindings.getBindings()) {
- if (binding instanceof QueueBinding) {
- ((QueueBinding) binding).getQueue().pause(false);
+ if (binding instanceof LocalQueueBinding) {
+ ((LocalQueueBinding) binding).getQueue().pause(false);
}
}
}
@@ -278,8 +278,8 @@ public class AddressInfo {
Bindings bindings =
postOffice.lookupBindingsForAddress(this.getName());
if (bindings != null) {
for (Binding binding : bindings.getBindings()) {
- if (binding instanceof QueueBinding) {
- ((QueueBinding) binding).getQueue().resume();
+ if (binding instanceof LocalQueueBinding) {
+ ((LocalQueueBinding) binding).getQueue().resume();
}
}
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/ClusteredBridgeReconnectTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/ClusteredBridgeReconnectTest.java
index e2ac8e8aa9..62fecf764d 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/ClusteredBridgeReconnectTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/ClusteredBridgeReconnectTest.java
@@ -17,7 +17,9 @@
package org.apache.activemq.artemis.tests.integration.cluster.bridge;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
@@ -28,17 +30,26 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.SimpleString;
+import
(activemq-website) branch main updated: Commit report artemis 2.36.0
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-website.git
The following commit(s) were added to refs/heads/main by this push:
new 0a762b7ca Commit report artemis 2.36.0
0a762b7ca is described below
commit 0a762b7caa0ccabcd604a9b08ea4ccc8c1cb4bb8
Author: Clebert Suconic
AuthorDate: Thu Jul 25 19:49:42 2024 -0400
Commit report artemis 2.36.0
---
.../artemis/download/commit-report-2.36.0.html | 542 +
1 file changed, 542 insertions(+)
diff --git a/src/components/artemis/download/commit-report-2.36.0.html
b/src/components/artemis/download/commit-report-2.36.0.html
new file mode 100644
index 0..ea69e3928
--- /dev/null
+++ b/src/components/artemis/download/commit-report-2.36.0.html
@@ -0,0 +1,542 @@
+
+
+
+
+
+
+
+$(document).ready( function () {
+$("#gitreport").DataTable();
+} );
+
+
+
+
+
+
+Release report 2.35.0(b4d3a776499cb3ef9a350107faa998c81b20c3e6) and
2.36.0(75f17ba64df10663a14fcc85bcb5398d23941b6d)
+
+
+#CommitDateAuthorShort
MessageARTEMIS
JIRAsAddRepDelTottestdocs/examples/
+
+1
+f4fd2592024/06/12
11:58:53Clebert Suconic[maven-release-plugin] prepare for
next development iteration
+
+2
+dd6c74f2024/06/12
15:26:11Clebert SuconicARTEMIS-4667
ReplayManager does not work with replicationMajor/Bug/Fixed/Closed
(ARTEMIS-4667)
+69015ReplayWithReplicationTest.javahttps://github.com/apache/activemq-artemis/commit/7f038de9ad0d999044749c6ab398ef2f2d8dee5f'>3
+7f038de2024/06/12
18:32:18Clebert SuconicARTEMIS-4667
Fixing replay manager with replication on the large message caseMajor/Bug/Fixed/Closed
(ARTEMIS-4667)
+5005
+4
+106418d2024/06/13
10:06:36Clebert SuconicNO-JIRA ReplayTest paging
tests
+ReplayTest.javahttps://github.com/apache/activemq-artemis/commit/b1c28d7bd416e614e6ec0504a6099f017a5e62a3'>5
+b1c28d72024/06/13
11:06:50Jeroen van GorkumARTEMIS-4816:
Docker image echo's admin credentials during startupMajor/Bug/Fixed/Closed
(ARTEMIS-4816)
+001-1
+6
+165a9332024/06/13
12:09:38Clebert SuconicNO-JIRA Specifying default
--commit-interval on transfer
+0101
+7
+58e8dea2024/06/13
16:43:56Clebert SuconicARTEMIS-2892
Interrupted replication could lead to restart problemsMajor/Bug/Fixed/Closed
(ARTEMIS-2892)
+48111RepeatStartBackupTest.javahttps://github.com/apache/activemq-artemis/commit/a6ff05ecd7c83e28fe23092e62b10e1078221b57'>8
+a6ff05e2024/06/13
11:45:04Timothy BishARTEMIS-4817
Check policy credits before checking parent creditsMinor/Bug/Fixed/Closed
(ARTEMIS-4817)
+0101AMQPFederationAddressPolicyTest.javahttps://github.com/apache/activemq-artemis/commit/c6f227cbb883469247dd7c2389493be579ad35a0'>9
+c6f227c2024/06/17
13:54:44Timothy BishARTEMIS-4820 Read
Header TTL as unsigned integer to set expirationMinor/Bug/Fixed/Closed
(ARTEMIS-4820)
+0101AMQPMessageTest.javahttps://github.com/apache/activemq-artemis/commit/4967a0c4ba807968df2c22a8974fc5d1349aa7b4'>10
+4967a0c2024/06/17
15:06:56Justin BertramNO-JIRA clarify CLI docs
+
+11
+a10694f2024/06/14
07:23:43Domenico Francesco BruscinoARTEMIS-4818
Improve support for multiple broker plugins from broker
propertiesMajor/Improvement/Fixed/Closed
(ARTEMIS-4818)
+918027ConfigurationImplTest.java
[...]
+12
+e5e95f42024/06/18
07:24:31Domenico Francesco BruscinoARTEMIS-4818
Support classes with .class in the packageMajor/Improvement/Fixed/Closed
(ARTEMIS-4818)
+0303ConfigurationImplTest.java(+
[...]
+13
+ee9d0162024/06/18
18:45:31Clebert SuconicNO-JIRA Adding test on
WildcardAddressManagerUnitTest.java
+WildcardAddressManagerUnitTest.javahttps://github.com/apache/activemq-artemis/commit/166adf4bfbe25a643bd4b7442f2a6a562341'>14
+166adf42024/06/11
23:10:54Josh BysterARTEMIS-4814 Make
direct binding lookup time constantMajor/Improvement/Fixed/Closed
(ARTEMIS-4814)
+713020WildcardAddressManagerUnitTest.javahttps://github.com/apache/activemq-artemis/commit/ae8fd6dbdbae2653194512b97484a27440a38f6d'>15
+ae8fd6d2024/06/19
05:01:13Robbie GemmellARTEMIS-4822:
disable timestamps in PDF metadata, making it and artemis-website output
reproducibleMajor/Task/Fixed/Closed
(ARTEMIS-4822)
+
+16
+cbdc1972024/06/19
10:46:01Domenico Francesco BruscinoARTEMIS-4823
Upgrade BouncyCastle to 1.78.1Major/Dependency
upgrade/Fixed/Closed (ARTEMIS-4823)
+
+17
+6fe19972024/06/19
12:15:44Robbie GemmellARTEMIS-4822:
update commons pom to avoid varying dependency-reduced replacement
pomMajor/Task/Fixed/Closed
(ARTEMIS-4822)
+
+18
+be1459c2024/06/19
13:43:14Justin BertramARTEMIS-4826
avoid implicit int conversion to longMinor/Bug/Fixed/Closed
(ARTEMIS-4826)
+0101
+19
+80ec64c2024/06/19
14:55:52Justin BertramARTEMIS-4827
remove unreachable or redundant codeTrivial/Bug/Fixed/Closed
(ARTEMIS-4827)
+012-1
+20
+8d3508e2024/06/19
13:59:53Jus
svn commit: r70551 - in /dev/activemq/activemq-artemis: 2.35.0/ 2.36.0/
Author: clebertsuconic Date: Thu Jul 25 18:42:34 2024 New Revision: 70551 Log: 2.36.0 release for artemis Added: dev/activemq/activemq-artemis/2.36.0/ dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz (with props) dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz.asc dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz.sha512 dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip (with props) dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip.asc dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip.sha512 dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-source-release.tar.gz (with props) dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-source-release.tar.gz.asc dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-source-release.tar.gz.sha512 dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-source-release.zip (with props) dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-source-release.zip.asc dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-source-release.zip.sha512 Removed: dev/activemq/activemq-artemis/2.35.0/ Added: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz == Binary file - no diff available. Propchange: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz.asc == --- dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz.asc (added) +++ dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz.asc Thu Jul 25 18:42:34 2024 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQEzBAABCgAdFiEEKEF8leiQbRCDkoIjVKQ/MlSGhBAFAmaimbEACgkQVKQ/MlSG +hBDndgf8DuNipa8c4mvkrUPoSvvH141hM2O36UFWGTQLP2IoT4HIU/b6Ik5CgX8x +8ZRuSMIFM9QO8bGa7m2hpP5LU6Zu5DU4v3ygD7l543RV9FiMAxJ+VC5FHvDJ56Oa +nTf1BT6uhS4L3B2sURktWGGzbylUyKQ6fvoUszvf9jmv2AGwcl9KkfSnO10Jio3y +tEhpMVDF3Co8gFPA66hSWP9BjUqo7N+a+q+850jhFzwWcLujcyVIse4+G+5zNsM5 +wPyM+FF5StSAV/tjeKUpKUCe5ZR2fPOnQXi5WY38Okbct1uIxHT+N9e4FC7+609P +NDtxWbrncHCRnOfMok5SPeilU97VrA== +=kC7I +-END PGP SIGNATURE- Added: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz.sha512 == --- dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz.sha512 (added) +++ dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.tar.gz.sha512 Thu Jul 25 18:42:34 2024 @@ -0,0 +1 @@ +ba78e09e47ec2ff3604f21b0f110f736b506fc1d14ed5ccaf461d44957ec69aacd05ff5ab1aa9a3a5909d3677ed78a6c876e3d635ee1e0f816e9035370bc13a3 apache-artemis-2.36.0-bin.tar.gz Added: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip == Binary file - no diff available. Propchange: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip.asc == --- dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip.asc (added) +++ dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip.asc Thu Jul 25 18:42:34 2024 @@ -0,0 +1,12 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - https://gpgtools.org + +iQEzBAABCgAdFiEEKEF8leiQbRCDkoIjVKQ/MlSGhBAFAmaimbEACgkQVKQ/MlSG +hBCOEQf8CWF8sUHZ30FCVVZp9HbKjCNQPYNpC9kePIZDorxNa3zPtGWPN3TgAJ6A +25QQAPv91ruc+9cZ8DgkzQepJKwubtCEMsxji/DVDHJhx4fXwOVMbesUF4wcpa9N +wmSvnz73enOik5OgDUCP2ba+1LeWZPKXeEwbA1TmcwVXQI8/UR4AhsqMmqG/ZQBM +4hu0xK+RNhG0Ew2wTTNYGp323DxltT8BJAxxdmEfXXWsSBXD0xICeIht2cBVUKtw +xMrKMSprQ39XGaX11Gifu7D8VrwHvmcWb/2RuYfZ8ikg1hqhvA2SfzC8snMQgQlD +R4HeyhD9vp0i9Q//gfPF1l63dYEaxQ== +=kdMP +-END PGP SIGNATURE- Added: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip.sha512 == --- dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip.sha512 (added) +++ dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0-bin.zip.sha512 Thu Jul 25 18:42:34 2024 @@ -0,0 +1 @@ +26c61b9220386ff37fb2d02876618ed6e94dac8669933342d32d805a466dfe182d1d77bd380fae6418c942a89d7aaf21aafebc93c488e4c903390d6bc1a86afa apache-artemis-2.36.0-bin.zip Added: dev/activemq/activemq-artemis/2.36.0/apache-artemis-2.36.0
(activemq-artemis) annotated tag 2.36.0 created (now 317b630488)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to annotated tag 2.36.0 in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git at 317b630488 (tag) tagging 75f17ba64df10663a14fcc85bcb5398d23941b6d (commit) replaces 2.35.0 by Clebert Suconic on Thu Jul 25 13:47:09 2024 -0400 - Log - [maven-release-plugin] copy for tag 2.36.0 --- No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 01/02: [maven-release-plugin] prepare release 2.36.0
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git commit 75f17ba64df10663a14fcc85bcb5398d23941b6d Author: Clebert Suconic AuthorDate: Thu Jul 25 13:47:09 2024 -0400 [maven-release-plugin] prepare release 2.36.0 --- artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 2 +- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-log-annotation-processor/tests/pom.xml | 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 6 +++--- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml | 2 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- tests/karaf-client-integration-tests/pom.xml| 2 +- tests/karaf-server-integration-tests/pom.xml| 2 +- tests/leak-tests/pom.xml| 2 +- tests
(activemq-artemis) branch main updated (db0ba73aa4 -> fa917ae3fd)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from db0ba73aa4 ARTEMIS-4941 Remove lazy update after application properties only when it's paging new 75f17ba64d [maven-release-plugin] prepare release 2.36.0 new fa917ae3fd [maven-release-plugin] prepare for next development iteration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 2 +- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-log-annotation-processor/tests/pom.xml | 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 4 ++-- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml
(activemq-artemis) 02/02: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git commit fa917ae3fd84eabdab44381328decc8ae794e208 Author: Clebert Suconic AuthorDate: Thu Jul 25 13:47:10 2024 -0400 [maven-release-plugin] prepare for next development iteration --- artemis-bom/pom.xml | 2 +- artemis-boot/pom.xml| 2 +- artemis-cdi-client/pom.xml | 2 +- artemis-cli/pom.xml | 2 +- artemis-commons/pom.xml | 2 +- artemis-core-client-all/pom.xml | 2 +- artemis-core-client-osgi/pom.xml| 2 +- artemis-core-client/pom.xml | 2 +- artemis-distribution/pom.xml| 2 +- artemis-dto/pom.xml | 2 +- artemis-features/pom.xml| 2 +- artemis-hawtio/activemq-branding/pom.xml| 2 +- artemis-hawtio/artemis-console/pom.xml | 2 +- artemis-hawtio/artemis-plugin/pom.xml | 2 +- artemis-hawtio/pom.xml | 2 +- artemis-image/examples/pom.xml | 2 +- artemis-image/pom.xml | 2 +- artemis-jakarta-client-all/pom.xml | 2 +- artemis-jakarta-client/pom.xml | 2 +- artemis-jakarta-ra/pom.xml | 2 +- artemis-jakarta-server/pom.xml | 2 +- artemis-jakarta-service-extensions/pom.xml | 2 +- artemis-jdbc-store/pom.xml | 2 +- artemis-jms-client-all/pom.xml | 2 +- artemis-jms-client-osgi/pom.xml | 2 +- artemis-jms-client/pom.xml | 2 +- artemis-jms-server/pom.xml | 2 +- artemis-journal/pom.xml | 2 +- artemis-junit/artemis-junit-4/pom.xml | 2 +- artemis-junit/artemis-junit-5/pom.xml | 2 +- artemis-junit/artemis-junit-commons/pom.xml | 2 +- artemis-junit/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-api/pom.xml | 2 +- artemis-lockmanager/artemis-lockmanager-ri/pom.xml | 2 +- artemis-lockmanager/pom.xml | 2 +- artemis-log-annotation-processor/pom.xml| 2 +- artemis-log-annotation-processor/tests/pom.xml | 2 +- artemis-maven-plugin/pom.xml| 2 +- artemis-pom/pom.xml | 2 +- artemis-protocols/artemis-amqp-protocol/pom.xml | 2 +- artemis-protocols/artemis-hornetq-protocol/pom.xml | 2 +- artemis-protocols/artemis-hqclient-protocol/pom.xml | 2 +- artemis-protocols/artemis-jakarta-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-mqtt-protocol/pom.xml | 2 +- artemis-protocols/artemis-openwire-protocol/pom.xml | 2 +- artemis-protocols/artemis-stomp-protocol/pom.xml| 2 +- artemis-protocols/pom.xml | 2 +- artemis-ra/pom.xml | 2 +- artemis-selector/pom.xml| 2 +- artemis-server-osgi/pom.xml | 2 +- artemis-server/pom.xml | 2 +- artemis-service-extensions/pom.xml | 2 +- artemis-unit-test-support/pom.xml | 2 +- artemis-web/pom.xml | 2 +- artemis-website/pom.xml | 2 +- pom.xml | 6 +++--- tests/activemq5-unit-tests/pom.xml | 2 +- tests/artemis-test-support/pom.xml | 2 +- tests/compatibility-tests/pom.xml | 2 +- tests/db-tests/pom.xml | 2 +- tests/e2e-tests/pom.xml | 2 +- tests/integration-tests-isolated/pom.xml| 2 +- tests/integration-tests/pom.xml | 2 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- tests/karaf-client-integration-tests/pom.xml| 2 +- tests/karaf-server-integration-tests/pom.xml| 2 +- tests/leak-tests/pom.xml| 2
(activemq-artemis) branch main updated (90797e1c42 -> db0ba73aa4)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 90797e1c42 ARTEMIS-4953: update to activemq 5.18.5 new 1a5c2ec51c Revert "ARTEMIS-4941 Remove lazy update after application properties as it's no longer needed" new db0ba73aa4 ARTEMIS-4941 Remove lazy update after application properties only when it's paging The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/activemq/artemis/api/core/Message.java | 6 ++ .../protocol/amqp/broker/AMQPLargeMessage.java | 1 + .../artemis/protocol/amqp/broker/AMQPMessage.java | 25 +++ .../protocol/amqp/broker/AMQPStandardMessage.java | 11 ++- .../protocol/amqp/broker/AMQPMessageTest.java | 25 ++- .../core/paging/cursor/PagedReferenceImpl.java | 14 ++-- .../artemis/core/paging/impl/PagedMessageImpl.java | 3 + .../artemis/core/server/impl/QueueImpl.java| 4 +- .../integration/amqp/paging/AmqpPagingTest.java| 83 ++ 9 files changed, 163 insertions(+), 9 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 01/02: Revert "ARTEMIS-4941 Remove lazy update after application properties as it's no longer needed"
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 1a5c2ec51c54465e0d845cc2bec380032cba6834
Author: Clebert Suconic
AuthorDate: Thu Jul 25 08:54:08 2024 -0400
Revert "ARTEMIS-4941 Remove lazy update after application properties as
it's no longer needed"
This reverts commit fb2a57f3ed25895681d3636e3f5fb9d9b9d0a053.
---
.../apache/activemq/artemis/api/core/Message.java | 6 ++
.../protocol/amqp/broker/AMQPLargeMessage.java | 1 +
.../artemis/protocol/amqp/broker/AMQPMessage.java | 20 ++
.../protocol/amqp/broker/AMQPStandardMessage.java | 1 +
.../core/paging/cursor/PagedReferenceImpl.java | 14 ++--
.../artemis/core/server/impl/QueueImpl.java| 4 +-
.../integration/amqp/paging/AmqpPagingTest.java| 83 ++
.../jms/multiprotocol/JMSMessageConsumerTest.java | 39 --
8 files changed, 122 insertions(+), 46 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index 88abfa5531..2c6beaefda 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -809,6 +809,12 @@ public interface Message {
int getMemoryEstimate();
+ /** The first estimate that's been calculated without any updates. */
+ default int getOriginalEstimate() {
+ // For Core Protocol we always use the same estimate
+ return getMemoryEstimate();
+ }
+
/**
* This is the size of the message when persisted on disk which is used for
metrics tracking
* Note that even if the message itself is not persisted on disk (ie
non-durable) this value is
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
index 19621b1c59..777f3752ec 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
@@ -585,6 +585,7 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
public int getMemoryEstimate() {
if (memoryEstimate == -1) {
memoryEstimate = memoryOffset * 2 + (extraProperties != null ?
extraProperties.getEncodeSize() : 0);
+ originalEstimate = memoryEstimate;
}
return memoryEstimate;
}
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 86e6794d00..4c43401fac 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -43,6 +43,7 @@ import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import
org.apache.activemq.artemis.core.message.openmbean.CompositeDataConstants;
import
org.apache.activemq.artemis.core.message.openmbean.MessageOpenTypeFactory;
+import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.persistence.CoreMessageObjectPools;
import org.apache.activemq.artemis.core.persistence.Persister;
import org.apache.activemq.artemis.core.server.MessageReference;
@@ -203,6 +204,7 @@ public abstract class AMQPMessage extends RefCountMessage
implements org.apache.
protected long messageID;
protected SimpleString address;
protected volatile int memoryEstimate = -1;
+ protected volatile int originalEstimate = -1;
protected long expiration;
protected boolean expirationReload = false;
protected long scheduledTime = -1;
@@ -543,6 +545,13 @@ public abstract class AMQPMessage extends RefCountMessage
implements org.apache.
protected ApplicationProperties
lazyDecodeApplicationProperties(ReadableBuffer data) {
if (applicationProperties == null && applicationPropertiesPosition !=
VALUE_NOT_PRESENT) {
applicationProperties = scanForMessageSection(data,
applicationPropertiesPosition, ApplicationProperties.class);
+ if (owner != null && memoryEstimate != -1) {
+// the memory has already been tracked and needs to be updated to
refle
(activemq-artemis) 02/02: ARTEMIS-4941 Remove lazy update after application properties only when it's paging
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit db0ba73aa4f4df4aa7ed27ecd32520404a32e728
Author: Clebert Suconic
AuthorDate: Thu Jul 25 10:31:10 2024 -0400
ARTEMIS-4941 Remove lazy update after application properties only when it's
paging
for regular messages it's quite obvious when the message is leaving the
queue but for paged messages it becomes a challenge. We should just ignore the
update for paged messages.
---
.../artemis/protocol/amqp/broker/AMQPMessage.java | 11 --
.../protocol/amqp/broker/AMQPStandardMessage.java | 12 +--
.../protocol/amqp/broker/AMQPMessageTest.java | 25 +-
.../artemis/core/paging/impl/PagedMessageImpl.java | 3 ++
.../jms/multiprotocol/JMSMessageConsumerTest.java | 39 ++
5 files changed, 84 insertions(+), 6 deletions(-)
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 4c43401fac..724f71fc56 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -548,9 +548,14 @@ public abstract class AMQPMessage extends RefCountMessage
implements org.apache.
if (owner != null && memoryEstimate != -1) {
// the memory has already been tracked and needs to be updated to
reflect the new decoding
int addition =
unmarshalledApplicationPropertiesMemoryEstimateFromData(data);
-((PagingStore)owner).addSize(addition, false);
-final int updatedEstimate = memoryEstimate + addition;
-memoryEstimate = updatedEstimate;
+
+// it is difficult to track the updates for paged messages
+// for that reason we won't do it if paged
+if (!isPaged) {
+ ((PagingStore) owner).addSize(addition, false);
+ final int updatedEstimate = memoryEstimate + addition;
+ memoryEstimate = updatedEstimate;
+}
}
}
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPStandardMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPStandardMessage.java
index 245a838ad7..47d94f7032 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPStandardMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPStandardMessage.java
@@ -188,8 +188,16 @@ public class AMQPStandardMessage extends AMQPMessage {
@Override
public int getMemoryEstimate() {
if (memoryEstimate == -1) {
- memoryEstimate = memoryOffset + (data != null ? data.capacity() +
unmarshalledApplicationPropertiesMemoryEstimateFromData(data) : 0);
- originalEstimate = memoryEstimate;
+ if (isPaged) {
+// When the message is paged, we don't take the unmarshalled
application properties
+// because it could be updated at different places.
+// we just keep the estimate simple when paging
+memoryEstimate = memoryOffset + (data != null ? data.capacity() :
0);
+originalEstimate = memoryEstimate;
+ } else {
+memoryEstimate = memoryOffset + (data != null ? data.capacity() +
unmarshalledApplicationPropertiesMemoryEstimateFromData(data) : 0);
+originalEstimate = memoryEstimate;
+ }
}
return memoryEstimate;
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
index ea9d8d5728..26722de5d2 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessageTest.java
@@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
+import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Date;
@@ -88,9 +89,13 @@ import org.mockito.Mockito;
import io.n
(activemq-artemis) branch main updated: Edit on versions.adoc
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 00e400c96c Edit on versions.adoc 00e400c96c is described below commit 00e400c96c1870de05dd400b0a465816b1c266c2 Author: Clebert Suconic AuthorDate: Wed Jul 24 13:23:03 2024 -0400 Edit on versions.adoc --- docs/user-manual/versions.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/user-manual/versions.adoc b/docs/user-manual/versions.adoc index e7b7d3ad4c..847232b5a3 100644 --- a/docs/user-manual/versions.adoc +++ b/docs/user-manual/versions.adoc @@ -18,7 +18,7 @@ https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&versio === Highlights -* Many dependency libraries upgraded +* Numerous dependency upgrades * https://issues.apache.org/jira/browse/ARTEMIS-3509|[STOMP Websocket client disconnected after ConcurrentModificationException in Broker] * https://issues.apache.org/jira/browse/ARTEMIS-4949|[ava.nio.channels.ClosedChannelException with slower devices and NIO journal] - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: Update versions.adoc
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new e05549603a Update versions.adoc e05549603a is described below commit e05549603a44d5aab4b34e4c5455916f89fe9558 Author: Clebert Suconic AuthorDate: Wed Jul 24 13:16:51 2024 -0400 Update versions.adoc --- docs/user-manual/versions.adoc | 10 ++ 1 file changed, 10 insertions(+) diff --git a/docs/user-manual/versions.adoc b/docs/user-manual/versions.adoc index 3494e377c7..e7b7d3ad4c 100644 --- a/docs/user-manual/versions.adoc +++ b/docs/user-manual/versions.adoc @@ -12,6 +12,16 @@ NOTE: If the upgrade spans multiple versions then the steps from *each* version NOTE: Follow the general upgrade procedure outlined in the xref:upgrading.adoc#upgrading-the-broker[Upgrading the Broker] chapter in addition to any version-specific upgrade instructions outlined here. +== 2.36.0 + +https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&version=12354818[Full release notes] + +=== Highlights + +* Many dependency libraries upgraded +* https://issues.apache.org/jira/browse/ARTEMIS-3509|[STOMP Websocket client disconnected after ConcurrentModificationException in Broker] +* https://issues.apache.org/jira/browse/ARTEMIS-4949|[ava.nio.channels.ClosedChannelException with slower devices and NIO journal] + == 2.35.0 https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12315920&version=12354784[Full release notes] - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-3509 Improving assertions in StompTest
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new ca44ad2a33 ARTEMIS-3509 Improving assertions in StompTest
ca44ad2a33 is described below
commit ca44ad2a33e68b813ecd961c3b9c3d6f48d9f9ee
Author: Clebert Suconic
AuthorDate: Wed Jul 24 10:44:21 2024 -0400
ARTEMIS-3509 Improving assertions in StompTest
---
.../org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java | 4
1 file changed, 4 insertions(+)
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
index d20349776f..a392b020a0 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
@@ -179,5 +179,9 @@ public class StompSoakTest extends SoakTestBase {
}
Assertions.assertEquals(0, errors.get());
+
+ File artemisLog = new File("target/" + SERVER_NAME_0 +
"/log/artemis.log");
+ Assertions.assertFalse(findLogRecord(artemisLog, "AMQ222151"));
+ Assertions.assertFalse(findLogRecord(artemisLog,
"ConcurrentModificationException"));
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: Revert "ARTEMIS-3509 Improving assertions on StompTest"
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new e50c73eac9 Revert "ARTEMIS-3509 Improving assertions on StompTest"
e50c73eac9 is described below
commit e50c73eac96983ef1b848a4041e243659d29a88e
Author: Clebert Suconic
AuthorDate: Wed Jul 24 10:41:50 2024 -0400
Revert "ARTEMIS-3509 Improving assertions on StompTest"
Sorry for the spam, I pushed this commit by mistake / accident
This reverts commit db0a0975bbe2e993342048dbfce7c52617249886.
---
.../activemq/artemis/utils/RealServerTestBase.java | 8 ++--
.../artemis/tests/smoke/logging/AuditLoggerTest.java | 18 +-
.../tests/smoke/nettynative/NettyNativeTest.java | 3 ++-
.../ClusterNotificationsContinuityTest.java| 2 +-
.../artemis/tests/soak/stomp/StompSoakTest.java| 5 -
5 files changed, 14 insertions(+), 22 deletions(-)
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
index e3f2541ab9..70fe9b2d4a 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
+++
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
@@ -190,7 +190,7 @@ public class RealServerTestBase extends ActiveMQTestBase {
recreateDirectory(homeInstance + "/log");
}
- protected boolean findLogRecord(File logFile, boolean matchAnyValue,
String... values) throws Exception {
+ protected boolean findLogRecord(File logFile, String... values) throws
Exception {
assertTrue(logFile.exists());
boolean hasRecord = false;
try (BufferedReader reader = new BufferedReader(new
FileReader(logFile))) {
@@ -200,17 +200,13 @@ public class RealServerTestBase extends ActiveMQTestBase {
boolean hasAll = true;
for (int i = 1; i < values.length; i++) {
if (!line.contains(values[i])) {
- if (matchAnyValue) {
-logger.warn("value {} ", values[i], new
Exception("trace"));
-return true;
- }
hasAll = false;
break;
}
}
if (hasAll) {
hasRecord = true;
- logger.debug("log found: {}", line);
+ logger.debug("audit found: {}", line);
break;
}
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
index 4c575c983c..fef73c3c60 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
@@ -94,7 +94,7 @@ public class AuditLoggerTest extends AuditLoggerTestBase {
Wait.waitFor(() -> addressControl.getMessageCount() == 1);
assertEquals(1, addressControl.getMessageCount());
- assertTrue(findLogRecord(getAuditLog(), false, "sending a message",
uniqueStr));
+ assertTrue(findLogRecord(getAuditLog(),"sending a message", uniqueStr));
//failure log
address = RandomUtil.randomSimpleString();
@@ -117,9 +117,9 @@ public class AuditLoggerTest extends AuditLoggerTestBase {
//ignore
}
- assertTrue(findLogRecord(getAuditLog(), false, "AMQ601264: User guest",
"gets security check failure, reason = AMQ229213: User: guest does not have
permission='DELETE_NON_DURABLE_QUEUE'"));
+ assertTrue(findLogRecord(getAuditLog(),"AMQ601264: User guest", "gets
security check failure, reason = AMQ229213: User: guest does not have
permission='DELETE_NON_DURABLE_QUEUE'"));
//hot patch not in log
- assertTrue(findLogRecord(getAuditLog(), false, "is sending a message"));
+ assertTrue(findLogRecord(getAuditLog(),"is sending a message"));
}
@Test
@@ -182,10 +182,10 @@ public class AuditLoggerTest extends AuditLoggerTestBase {
Wait.waitFor(() -> addressControl.getMessageCount() == 2);
assertEquals(2, addressControl.getMessageCount());
- assertFalse(findLogRecord(getAuditLog(), false, "messageID=0"));
- assertTrue(findLogRecord(getAuditLog(), false, "sent a message"));
-
(activemq-artemis) branch main updated: ARTEMIS-3509 Improving assertions on StompTest
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new db0a0975bb ARTEMIS-3509 Improving assertions on StompTest
db0a0975bb is described below
commit db0a0975bbe2e993342048dbfce7c52617249886
Author: Clebert Suconic
AuthorDate: Wed Jul 24 09:59:35 2024 -0400
ARTEMIS-3509 Improving assertions on StompTest
---
.../activemq/artemis/utils/RealServerTestBase.java | 8 ++--
.../artemis/tests/smoke/logging/AuditLoggerTest.java | 18 +-
.../tests/smoke/nettynative/NettyNativeTest.java | 3 +--
.../ClusterNotificationsContinuityTest.java| 2 +-
.../artemis/tests/soak/stomp/StompSoakTest.java| 5 +
5 files changed, 22 insertions(+), 14 deletions(-)
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
index 70fe9b2d4a..e3f2541ab9 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
+++
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
@@ -190,7 +190,7 @@ public class RealServerTestBase extends ActiveMQTestBase {
recreateDirectory(homeInstance + "/log");
}
- protected boolean findLogRecord(File logFile, String... values) throws
Exception {
+ protected boolean findLogRecord(File logFile, boolean matchAnyValue,
String... values) throws Exception {
assertTrue(logFile.exists());
boolean hasRecord = false;
try (BufferedReader reader = new BufferedReader(new
FileReader(logFile))) {
@@ -200,13 +200,17 @@ public class RealServerTestBase extends ActiveMQTestBase {
boolean hasAll = true;
for (int i = 1; i < values.length; i++) {
if (!line.contains(values[i])) {
+ if (matchAnyValue) {
+logger.warn("value {} ", values[i], new
Exception("trace"));
+return true;
+ }
hasAll = false;
break;
}
}
if (hasAll) {
hasRecord = true;
- logger.debug("audit found: {}", line);
+ logger.debug("log found: {}", line);
break;
}
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
index fef73c3c60..4c575c983c 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTest.java
@@ -94,7 +94,7 @@ public class AuditLoggerTest extends AuditLoggerTestBase {
Wait.waitFor(() -> addressControl.getMessageCount() == 1);
assertEquals(1, addressControl.getMessageCount());
- assertTrue(findLogRecord(getAuditLog(),"sending a message", uniqueStr));
+ assertTrue(findLogRecord(getAuditLog(), false, "sending a message",
uniqueStr));
//failure log
address = RandomUtil.randomSimpleString();
@@ -117,9 +117,9 @@ public class AuditLoggerTest extends AuditLoggerTestBase {
//ignore
}
- assertTrue(findLogRecord(getAuditLog(),"AMQ601264: User guest", "gets
security check failure, reason = AMQ229213: User: guest does not have
permission='DELETE_NON_DURABLE_QUEUE'"));
+ assertTrue(findLogRecord(getAuditLog(), false, "AMQ601264: User guest",
"gets security check failure, reason = AMQ229213: User: guest does not have
permission='DELETE_NON_DURABLE_QUEUE'"));
//hot patch not in log
- assertTrue(findLogRecord(getAuditLog(),"is sending a message"));
+ assertTrue(findLogRecord(getAuditLog(), false, "is sending a message"));
}
@Test
@@ -182,10 +182,10 @@ public class AuditLoggerTest extends AuditLoggerTestBase {
Wait.waitFor(() -> addressControl.getMessageCount() == 2);
assertEquals(2, addressControl.getMessageCount());
- assertFalse(findLogRecord(getAuditLog(), "messageID=0"));
- assertTrue(findLogRecord(getAuditLog(), "sent a message"));
- assertTrue(findLogRecord(getAuditLog(), uniqueStr));
- assertTrue(findLogRecord(getAuditLog(), "Hello2"));
+ assertFalse(findLogRecord(getAuditLog(), false, "messa
(activemq-artemis) branch main updated: ARTEMIS-4950 - MBeanGuard throws an NPE
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 9853211913 ARTEMIS-4950 - MBeanGuard throws an NPE
9853211913 is described below
commit 985321191388430390a51f451b543f36382345d6
Author: Andy Taylor
AuthorDate: Wed Jul 24 12:38:37 2024 +0100
ARTEMIS-4950 - MBeanGuard throws an NPE
Although this doesnt affect the current console it does the new so needs
addressing
---
.../server/management/ArtemisMBeanServerGuard.java | 8 +-
.../management/ArtemisMBeanServerGuardTest.java| 101 +
2 files changed, 108 insertions(+), 1 deletion(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java
index b7f973ccde..b275e8ed9c 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuard.java
@@ -132,7 +132,13 @@ public class ArtemisMBeanServerGuard implements
GuardInvocationHandler {
logger.debug("can't check invoke rights as object name invalid: {}",
object, e);
return false;
}
- if (canBypassRBAC(objectName)) {
+ /* HawtIO calls this with a null operationName as a coarse grained way
of authenticating against all the operations
+ * on an mbean. Until this addition this was throwing a null pointer on
operationName later in this call which was
+ * swallowed by HawtIO. Since fine grained checks are carried out
against every operation this was never an issue
+ * however the new console based on HawtIO 4 passes this exception back
to the console which breaks it. Since it is
+ * just an optimisation it is fine to always return true. Note that the
alternative ArtemisRbacInvocationHandler
+ * does allow the ability to restrict a whole mbean */
+ if (operationName == null || canBypassRBAC(objectName)) {
return true;
}
List requiredRoles = getRequiredRoles(objectName, operationName);
diff --git
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java
new file mode 100644
index 00..26f3cc3eff
--- /dev/null
+++
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+package org.apache.activemq.artemis.core.server.management;
+
+import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal;
+import org.apache.activemq.artemis.tests.util.ServerTestBase;
+import org.junit.Test;
+
+import javax.management.ObjectName;
+import javax.security.auth.Subject;
+import java.security.PrivilegedExceptionAction;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class ArtemisMBeanServerGuardTest extends ServerTestBase {
+ @Test
+ public void testInvokeNoMethod() throws Throwable {
+ ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard();
+ ObjectNameBuilder objectNameBuilder =
ObjectNameBuilder.create("testdomain", "myBroker");
+ ObjectName activeMQServerObjectName =
objectNameBuilder.getActiveMQServerObjectName();
+ assertTrue(guard.canInvoke(activeMQServerObjectName.getCanonicalName(),
null));
+ }
+
+ @Test
+ public void testCantInvokeMethod() throws Throwable {
+ ArtemisMBeanServerGuard guard = new ArtemisMBeanServerGuard();
+ ObjectNameBuilder objectNameBuilder =
ObjectNameBuilder.create("testdoma
(activemq-artemis) branch main updated: NO-JIRA Removing System.out from a test
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new ae26a8640f NO-JIRA Removing System.out from a test
ae26a8640f is described below
commit ae26a8640f5c6b486ba45800670f409e1660d1e6
Author: Clebert Suconic
AuthorDate: Tue Jul 23 16:28:15 2024 -0400
NO-JIRA Removing System.out from a test
---
.../activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java
index 65e8df231a..e6d9b6e0e6 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/sasl/SaslScramTest.java
@@ -51,7 +51,6 @@ public class SaslScramTest extends ActiveMQTestBase {
@BeforeEach
public void startBroker() throws Exception {
String loginConfPath = new
File(SaslScramTest.class.getResource("/login.config").toURI()).getAbsolutePath();
- System.out.println(loginConfPath);
System.setProperty("java.security.auth.login.config", loginConfPath);
BROKER = new EmbeddedActiveMQ();
URL urlScram = SaslScramTest.class.getResource("/broker-saslscram.xml");
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4949 TimedBuffer.checkSync could fail on ClosedChannelException
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 7c573db6a1 ARTEMIS-4949 TimedBuffer.checkSync could fail on
ClosedChannelException
7c573db6a1 is described below
commit 7c573db6a1aad9e90b907e9c8feb4639c4d4f63f
Author: Clebert Suconic
AuthorDate: Mon Jul 22 17:45:51 2024 -0400
ARTEMIS-4949 TimedBuffer.checkSync could fail on ClosedChannelException
---
.../artemis/core/io/nio/NIOSequentialFile.java | 27 +---
.../unit/core/journal/impl/TimedBufferTest.java| 72 ++
2 files changed, 90 insertions(+), 9 deletions(-)
diff --git
a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
index b823ca5d18..be95bf918b 100644
---
a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
+++
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
@@ -63,11 +63,11 @@ public class NIOSequentialFile extends
AbstractSequentialFile {
*/
private static final int CHUNK_SIZE = 2 * 1024 * 1024;
- private FileChannel channel;
+ protected volatile FileChannel channel;
- private RandomAccessFile rfile;
+ protected volatile RandomAccessFile rfile;
- private final int maxIO;
+ protected final int maxIO;
public NIOSequentialFile(final SequentialFileFactory factory,
final File directory,
@@ -317,18 +317,27 @@ public class NIOSequentialFile extends
AbstractSequentialFile {
@Override
public void sync() throws IOException {
- if (factory.isDatasync() && channel != null) {
+ FileChannel channel1 = channel;
+ if (factory.isDatasync() && channel1 != null && channel1.isOpen()) {
try {
-channel.force(false);
- } catch (ClosedChannelException e) {
-throw e;
+syncChannel(channel1);
} catch (IOException e) {
-factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e),
e.getMessage(), this);
-throw e;
+if (e instanceof ClosedChannelException) {
+ // ClosedChannelException here means the file was closed after
TimedBuffer issued a sync
+ // we are performing the sync away from locks to ensure
scalability and this is an expected cost
+ logger.debug("ClosedChannelException for file {}", file, e);
+} else {
+ factory.onIOError(new ActiveMQIOErrorException(e.getMessage(),
e), e.getMessage(), this);
+ throw e;
+}
}
}
}
+ protected void syncChannel(FileChannel syncChannel) throws IOException {
+ syncChannel.force(false);
+ }
+
@Override
public long size() throws IOException {
if (channel == null) {
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
index cb42f67dc2..e7054416e8 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/TimedBufferTest.java
@@ -19,7 +19,9 @@ package
org.apache.activemq.artemis.tests.unit.core.journal.impl;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -31,8 +33,11 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.core.io.DummyCallback;
import org.apache.activemq.artemis.core.io.IOCallback;
+import org.apache.activemq.artemis.core.io.SequentialFile;
import org.apache.activemq.artemis.core.io.buffer.TimedBuffer;
import org.apache.activemq.artemis.core.io.buffer.TimedBufferObserver;
+import org.apache.activemq.artemis.core.io.nio.NIOSequentialFile;
+import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
import org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.utils.Env;
@@ -211,9 +216,76 @@ public class TimedBufferTest extends ActiveMQTestBase {
} finally {
timedBuffer.stop();
}
+ }
+
+ @Test
+ public void test
(activemq-artemis) branch main updated: NO-JIRA Making test more resilient
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 41ec279e22 NO-JIRA Making test more resilient
41ec279e22 is described below
commit 41ec279e2240fd4a84e1c0e7902623682bc5e785
Author: Clebert Suconic
AuthorDate: Mon Jul 22 18:55:17 2024 -0400
NO-JIRA Making test more resilient
---
.../cluster/bridge/PageCounterOnBridgeFailoverTest.java | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/PageCounterOnBridgeFailoverTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/PageCounterOnBridgeFailoverTest.java
index 85111e2dd4..3c54162c03 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/PageCounterOnBridgeFailoverTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/PageCounterOnBridgeFailoverTest.java
@@ -44,8 +44,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class PageCounterOnBridgeFailoverTest extends FailoverTestBase {
private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -97,16 +95,10 @@ public class PageCounterOnBridgeFailoverTest extends
FailoverTestBase {
logger.info("Waiting for dc1Backup1 to be alive");
Wait.waitFor(dc1Backup1::isActive, 15000);
logger.info("dc1Backup1 isAlive");
- long messageCountNodeDC1 = getMessageCount(dc1Backup1, queueName0);
long messageCountNodeDC2 = getMessageCount(dc2Primary1, queueName0);
- logger.info("Count in post office: " + (messageCountNodeDC1 +
messageCountNodeDC2) + "messageCountNodeDC1:" + messageCountNodeDC1 + ",
messageCountNodeDC2:" + messageCountNodeDC2 + " should be equal to: " +
messageSent);
dc1Backup1.getClusterManager().deployBridge(bridgeConfiguration);
- Wait.waitFor(() -> getMessageCount(dc2Primary1, queueName0) ==
messageSent);
- messageCountNodeDC1 = getMessageCount(dc1Backup1, queueName0);
- messageCountNodeDC2 = getMessageCount(dc2Primary1, queueName0);
- logger.info("Count in post office: " + (messageCountNodeDC1 +
messageCountNodeDC2) + "messageCountNodeDC1:" + messageCountNodeDC1 + ",
messageCountNodeDC2:" + messageCountNodeDC2 + " should be equal to: " +
messageSent);
- assertEquals(messageSent, messageCountNodeDC2);
- assertEquals(0, messageCountNodeDC1);
+ Wait.assertEquals(messageSent, () -> getMessageCount(dc2Primary1,
queueName0));
+ Wait.assertEquals(0, () -> getMessageCount(dc1Backup1, queueName0));
} finally {
dc2Primary1.stop();
}
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4941 Remove lazy update after application properties as it's no longer needed
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new fb2a57f3ed ARTEMIS-4941 Remove lazy update after application
properties as it's no longer needed
fb2a57f3ed is described below
commit fb2a57f3ed25895681d3636e3f5fb9d9b9d0a053
Author: Clebert Suconic
AuthorDate: Mon Jul 22 12:25:03 2024 -0400
ARTEMIS-4941 Remove lazy update after application properties as it's no
longer needed
---
.../apache/activemq/artemis/api/core/Message.java | 6 --
.../protocol/amqp/broker/AMQPLargeMessage.java | 1 -
.../artemis/protocol/amqp/broker/AMQPMessage.java | 20 --
.../protocol/amqp/broker/AMQPStandardMessage.java | 1 -
.../core/paging/cursor/PagedReferenceImpl.java | 14 ++--
.../artemis/core/server/impl/QueueImpl.java| 4 +-
.../integration/amqp/paging/AmqpPagingTest.java| 83 --
.../jms/multiprotocol/JMSMessageConsumerTest.java | 39 ++
8 files changed, 46 insertions(+), 122 deletions(-)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index 2c6beaefda..88abfa5531 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -809,12 +809,6 @@ public interface Message {
int getMemoryEstimate();
- /** The first estimate that's been calculated without any updates. */
- default int getOriginalEstimate() {
- // For Core Protocol we always use the same estimate
- return getMemoryEstimate();
- }
-
/**
* This is the size of the message when persisted on disk which is used for
metrics tracking
* Note that even if the message itself is not persisted on disk (ie
non-durable) this value is
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
index 777f3752ec..19621b1c59 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPLargeMessage.java
@@ -585,7 +585,6 @@ public class AMQPLargeMessage extends AMQPMessage
implements LargeServerMessage
public int getMemoryEstimate() {
if (memoryEstimate == -1) {
memoryEstimate = memoryOffset * 2 + (extraProperties != null ?
extraProperties.getEncodeSize() : 0);
- originalEstimate = memoryEstimate;
}
return memoryEstimate;
}
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 4c43401fac..86e6794d00 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -43,7 +43,6 @@ import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import
org.apache.activemq.artemis.core.message.openmbean.CompositeDataConstants;
import
org.apache.activemq.artemis.core.message.openmbean.MessageOpenTypeFactory;
-import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.persistence.CoreMessageObjectPools;
import org.apache.activemq.artemis.core.persistence.Persister;
import org.apache.activemq.artemis.core.server.MessageReference;
@@ -204,7 +203,6 @@ public abstract class AMQPMessage extends RefCountMessage
implements org.apache.
protected long messageID;
protected SimpleString address;
protected volatile int memoryEstimate = -1;
- protected volatile int originalEstimate = -1;
protected long expiration;
protected boolean expirationReload = false;
protected long scheduledTime = -1;
@@ -545,13 +543,6 @@ public abstract class AMQPMessage extends RefCountMessage
implements org.apache.
protected ApplicationProperties
lazyDecodeApplicationProperties(ReadableBuffer data) {
if (applicationProperties == null && applicationPropertiesPosition !=
VALUE_NOT_PRESENT) {
applicationProperties = scanForMessageSection(data,
applicationPropertiesPosition, ApplicationProperties.class);
- if (owner != null
(activemq-artemis) branch main updated: ARTEMIS-4821 OperationContext leaking on SendAckThread
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 9e8df4cf7a ARTEMIS-4821 OperationContext leaking on SendAckThread
9e8df4cf7a is described below
commit 9e8df4cf7a9dc846a01dccac5e661efe229a0057
Author: Clebert Suconic
AuthorDate: Fri Jul 19 17:28:20 2024 -0400
ARTEMIS-4821 OperationContext leaking on SendAckThread
co-authored: nmeylan (test attached to the JIRA)
---
.../cursor/impl/PageCounterRebuildManager.java | 2 +-
.../core/server/cluster/impl/BridgeImpl.java | 57 +---
.../bridge/PageCounterOnBridgeFailoverTest.java| 153 +
3 files changed, 189 insertions(+), 23 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCounterRebuildManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCounterRebuildManager.java
index 1f60af52af..cdb7ded883 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCounterRebuildManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCounterRebuildManager.java
@@ -76,7 +76,7 @@ public class PageCounterRebuildManager implements Runnable {
try {
paging = store.isPaging();
if (!paging) {
- logger.trace("Destination {} was not paging, no need to rebuild
counters");
+ logger.trace("Destination {} was not paging, no need to rebuild
counters", store.getAddress());
store.getCursorProvider().forEachSubscription(subscription -> {
subscription.getCounter().markRebuilding();
subscription.getCounter().finishRebuild();
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 71b09e4310..01ded75a40 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -55,6 +55,8 @@ import
org.apache.activemq.artemis.core.client.impl.ServerLocatorInternal;
import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.filter.Filter;
import org.apache.activemq.artemis.core.filter.impl.FilterImpl;
+import org.apache.activemq.artemis.core.persistence.OperationContext;
+import
org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl;
import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
@@ -146,6 +148,8 @@ public class BridgeImpl implements Bridge,
SessionFailureListener, SendAcknowled
private final BridgeConfiguration configuration;
+ private final OperationContextImpl bridgeContext;
+
public BridgeImpl(final ServerLocatorInternal serverLocator,
final BridgeConfiguration configuration,
final UUID nodeUUID,
@@ -175,6 +179,8 @@ public class BridgeImpl implements Bridge,
SessionFailureListener, SendAcknowled
this.filter = FilterImpl.createFilter(configuration.getFilterString());
this.server = server;
+
+ this.bridgeContext = new OperationContextImpl(executor);
}
public static final byte[] getDuplicateBytes(final UUID nodeUUID, final
long messageID) {
@@ -447,37 +453,44 @@ public class BridgeImpl implements Bridge,
SessionFailureListener, SendAcknowled
@Override
public void sendAcknowledged(final Message message) {
- logger.debug("Bridge {} received confirmation for message {}",
configuration.getName(), message);
+ OperationContext oldContext = OperationContextImpl.getContext();
- State localState = state;
- if (localState == State.STARTED || localState == State.STOPPING ||
localState == State.PAUSING) {
- try {
+ try {
+ OperationContextImpl.setContext(bridgeContext);
+ logger.debug("Bridge {} received confirmation for message {}",
configuration.getName(), message);
-final MessageReference ref;
+ State localState = state;
+ if (localState == State.STARTED || localState == State.STOPPING ||
localState == State.PAUSING) {
+try {
-synchronized (refs) {
- ref = refs.remove(message.getMessageID());
-}
+ final MessageReference ref;
-if (ref != null) {
- if (logger.isTraceE
(activemq-artemis) branch main updated: NO-JIRA Speeding up test
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new bcdf626efa NO-JIRA Speeding up test
bcdf626efa is described below
commit bcdf626efa585b7e2aafdb188a3fb984fe50ba98
Author: Clebert Suconic
AuthorDate: Thu Jul 18 14:22:29 2024 -0400
NO-JIRA Speeding up test
Removing redundant verification that was just spending time and not being
verified.
---
.../tests/integration/cluster/failover/ReplicatedFailoverTest.java | 5 -
1 file changed, 5 deletions(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java
index 3be03403d7..2c9be428a0 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedFailoverTest.java
@@ -20,7 +20,6 @@ import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.concurrent.TimeUnit;
import com.sun.net.httpserver.HttpServer;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
@@ -117,10 +116,6 @@ public class ReplicatedFailoverTest extends FailoverTest {
waitForSync(primaryServer.getServer());
- backupServer.getServer().waitForActivation(5, TimeUnit.SECONDS);
-
- waitForSync(primaryServer.getServer());
-
waitForServerToStart(backupServer.getServer());
assertTrue(backupServer.getServer().isStarted());
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated (58f9e00874 -> da7dccae87)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 58f9e00874 ARTEMIS-4925 adding missing assertion on the test new 79708749e8 NO-JIRA Speending up a failover test new da7dccae87 ARTEMIS-4925 Making assertion to also consider journal and other files from the broker The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../failover/ReplicatedPagedFailoverTest.java | 73 ++ .../mirror/ReplicatedBothNodesMirrorTest.java | 4 +- 2 files changed, 36 insertions(+), 41 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 02/02: ARTEMIS-4925 Making assertion to also consider journal and other files from the broker
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit da7dccae87b0732d40618f6fedb159f076fc7dc7
Author: Clebert Suconic
AuthorDate: Thu Jul 18 09:44:57 2024 -0400
ARTEMIS-4925 Making assertion to also consider journal and other files from
the broker
Small change but say there's ever a leak on the journal. Removing the
clause from paging would allow to also capture other leaks.
This is currently not an issue and the test should still pass.
---
.../soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
index 93b9310848..33b1ffa64a 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
@@ -377,7 +377,7 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
// lsof is showing a file descriptor associated with multiple threads.
So it is expected to have quite a few repetitions
// when the issue is happening we would have around 40k, 50k entries or
a lot more if you add more messages.
- Assertions.assertTrue(openFiles < 2500, () -> "There was " + openFiles +
" open files");
+ Assertions.assertTrue(openFiles < 4000, () -> "There was " + openFiles +
" open files");
Assertions.assertEquals(0, errors.get(), "There are errors on the
senders");
}
@@ -393,7 +393,7 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
BufferedReader reader = new BufferedReader(new
InputStreamReader(inputStream));
AtomicInteger filesCounter = new AtomicInteger();
try (Stream lines = reader.lines()) {
- lines.filter(line -> line.contains("paging") &&
line.contains(basedir)).forEach(l -> {
+ lines.filter(line -> line.contains(basedir)).forEach(l -> {
logger.info("file {}", l);
filesCounter.incrementAndGet();
});
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 01/02: NO-JIRA Speending up a failover test
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 79708749e8d540b4243cdb4216adb07a2e9e6d22
Author: Clebert Suconic
AuthorDate: Thu Jul 18 11:07:06 2024 -0400
NO-JIRA Speending up a failover test
No need for the iterations, and a few minor improvements to the test.
This method was taking up to 15 seconds on the CI and the same method is
reused a couple times, resulting in many minutes wasted
---
.../failover/ReplicatedPagedFailoverTest.java | 73 ++
1 file changed, 34 insertions(+), 39 deletions(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
index 3d267dd068..787d0d0579 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.tests.integration.cluster.failover;
+import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
@@ -29,13 +30,18 @@ import
org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.NodeManager;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.utils.Wait;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ReplicatedPagedFailoverTest extends ReplicatedFailoverTest {
+ private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
@Override
protected ActiveMQServer createInVMFailoverServer(final boolean realFiles,
final Configuration
configuration,
@@ -78,74 +84,63 @@ public class ReplicatedPagedFailoverTest extends
ReplicatedFailoverTest {
// 0 - no tamper
// 1 - close files
// 2 - remove files
- private void internalBrowser(int temperMode) throws Exception {
+ private void internalBrowser(int tamperMode) throws Exception {
int numMessages = 50;
int messagesPerPage = 10;
- int iterations = 10;
createSessionFactory();
ClientSession session = createSession(sf, true, true);
-
session.createQueue(QueueConfiguration.of(FailoverTestBase.ADDRESS).setDurable(false));
+
session.createQueue(QueueConfiguration.of(FailoverTestBase.ADDRESS).setDurable(true));
ClientProducer producer =
session.createProducer(FailoverTestBase.ADDRESS);
Queue queue =
primaryServer.getServer().locateQueue(FailoverTest.ADDRESS);
- for (int j = 0; j < iterations; j++) {
- System.err.println("#iteration " + j);
- queue.getPageSubscription().getPagingStore().startPaging();
- assertNotNull(queue);
+ queue.getPageSubscription().getPagingStore().startPaging();
+ assertNotNull(queue);
- for (int i = 0; i < numMessages; i++) {
-// some are durable, some are not!
-producer.send(createMessage(session, i, i % 2 == 0));
-if (i > 0 && i % messagesPerPage == 0) {
- queue.getPageSubscription().getPagingStore().forceAnotherPage();
-}
+ for (int i = 0; i < numMessages; i++) {
+ // some are durable, some are not!
+ producer.send(createMessage(session, i, i % 2 == 0));
+ if (i > 0 && i % messagesPerPage == 0) {
+queue.getPageSubscription().getPagingStore().forceAnotherPage();
}
+ }
- ClientConsumer consumer =
session.createConsumer(FailoverTestBase.ADDRESS, true);
-
+ try (ClientConsumer consumer =
session.createConsumer(FailoverTestBase.ADDRESS, true)) {
session.start();
- while (true) {
+ for (int i = 0; i < numMessages; i++) {
ClientMessage msg = consumer.receive(500);
-if (msg == null) {
- break;
-}
+Assertions.assertNotNull(msg);
}
- consumer.close();
+ }
- PagingStore store = queue.getPageSubscription().getPagingStore();
+ PagingStore store = queue.getPageSubscription().getPagingStore();
- if (temperMode == 1) {
-// this is tampering with the system causing an artifical issue.
The system shou
(activemq-artemis) branch main updated: ARTEMIS-4925 adding missing assertion on the test
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 58f9e00874 ARTEMIS-4925 adding missing assertion on the test
58f9e00874 is described below
commit 58f9e00874556a195f23f9f88b0b0470659f0434
Author: Clebert Suconic
AuthorDate: Wed Jul 17 12:02:41 2024 -0400
ARTEMIS-4925 adding missing assertion on the test
---
.../soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
index 083a393357..93b9310848 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
@@ -378,6 +378,7 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
// lsof is showing a file descriptor associated with multiple threads.
So it is expected to have quite a few repetitions
// when the issue is happening we would have around 40k, 50k entries or
a lot more if you add more messages.
Assertions.assertTrue(openFiles < 2500, () -> "There was " + openFiles +
" open files");
+ Assertions.assertEquals(0, errors.get(), "There are errors on the
senders");
}
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4925 Allowing server reuse on a test
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 569a07c287 ARTEMIS-4925 Allowing server reuse on a test
569a07c287 is described below
commit 569a07c287ed891b105aab489585a6c7ab2efb4e
Author: Clebert Suconic
AuthorDate: Tue Jul 16 21:54:40 2024 -0400
ARTEMIS-4925 Allowing server reuse on a test
---
.../mirror/ReplicatedBothNodesMirrorTest.java | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
index 0cbb3360d1..083a393357 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
@@ -68,6 +68,8 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
private static final boolean TRACE_LOGS =
Boolean.parseBoolean(TestParameters.testProperty(TEST_NAME, "TRACE_LOGS",
"false"));
private static final int NUMBER_MESSAGES =
TestParameters.testProperty(TEST_NAME, "NUMBER_MESSAGES", 200);
+ private static final boolean REUSE_SERVERS =
Boolean.parseBoolean(TestParameters.testProperty(TEST_NAME, "REUSE_SERVERS",
"false"));
+
private static final int SEND_COMMIT =
TestParameters.testProperty(TEST_NAME, "SEND_COMMIT", 50);
/*
@@ -153,11 +155,15 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
boolean replicated,
String clusterStatic) throws Exception {
File serverLocation = getFileServerLocation(serverName);
+ if (REUSE_SERVERS && serverLocation.exists()) {
+ deleteDirectory(new File(serverLocation, "data"));
+ return;
+ }
deleteDirectory(serverLocation);
HelperCreate cliCreateServer = new HelperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
- cliCreateServer.setNoWeb(false);
+ cliCreateServer.setNoWeb(true);
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
cliCreateServer.addArgs("--queues", QUEUE_NAME);
cliCreateServer.setPortOffset(porOffset);
@@ -207,12 +213,16 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
private static void createMirroredBackupServer(String serverName, int
porOffset, String clusterStatic, String mirrorURI) throws Exception {
File serverLocation = getFileServerLocation(serverName);
+ if (REUSE_SERVERS && serverLocation.exists()) {
+ deleteDirectory(new File(serverLocation, "data"));
+ return;
+ }
deleteDirectory(serverLocation);
HelperCreate cliCreateServer = new HelperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
- cliCreateServer.setNoWeb(false);
+ cliCreateServer.setNoWeb(true);
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
cliCreateServer.setPortOffset(porOffset);
cliCreateServer.setClustered(true);
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-4925 small tweak on test
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 4b1952e3aa ARTEMIS-4925 small tweak on test
4b1952e3aa is described below
commit 4b1952e3aa9b5b95a584d223104455af26854ce5
Author: Clebert Suconic
AuthorDate: Tue Jul 16 19:09:53 2024 -0400
ARTEMIS-4925 small tweak on test
Using a lambda to close a resource
---
.../soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
index 8a40036db2..0cbb3360d1 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
@@ -335,8 +335,8 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
startDC1(managementDC1);
startDC2(managementDC2);
- runAfter(() -> managementDC1.close());
- runAfter(() -> managementDC2.close());
+ runAfter(managementDC1::close);
+ runAfter(managementDC2::close);
int destinations = 5;
ExecutorService executorService =
Executors.newFixedThreadPool(destinations);
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated (2bbf056edf -> 6c1134388b)
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git from 2bbf056edf ARTEMIS-4892: update to micrometer-core 1.13.2 new 5af90578cb ARTEMIS-4925 Test with mirror and replication. new 6c1134388b ARTEMIS-4925 Fixing issue with mirroring and replication The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../api/core/management/SimpleManagement.java | 18 + .../activemq/artemis/core/paging/impl/Page.java| 2 +- .../artemis/core/paging/impl/PagingStoreImpl.java | 2 +- .../artemis/core/persistence/StorageManager.java | 6 +- .../impl/journal/JournalStorageManager.java| 11 +- .../impl/nullpm/NullStorageManager.java| 2 +- .../artemis/core/protocol/ServerPacketDecoder.java | 2 +- .../wireformat/ReplicationPageWriteMessage.java| 37 +- .../core/replication/ReplicationEndpoint.java | 4 +- .../core/replication/ReplicationManager.java | 4 +- .../core/transaction/impl/TransactionImplTest.java | 2 +- .../tests/integration/client/SendAckFailTest.java | 4 +- .../integration/replication/ReplicationTest.java | 8 +- .../mirror/ReplicatedBothNodesMirrorTest.java | 413 + 14 files changed, 485 insertions(+), 30 deletions(-) create mode 100644 tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 02/02: ARTEMIS-4925 Fixing issue with mirroring and replication
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 6c1134388b4d0a3775b6b92b00e5e29baf1b683a
Author: Clebert Suconic
AuthorDate: Tue Jul 16 10:58:31 2024 -0400
ARTEMIS-4925 Fixing issue with mirroring and replication
the page writes on replica should include the address where they belong to
avoid leaks between the mirrorSNF and the actual addresses.
---
.../activemq/artemis/core/paging/impl/Page.java| 2 +-
.../artemis/core/paging/impl/PagingStoreImpl.java | 2 +-
.../artemis/core/persistence/StorageManager.java | 6 ++--
.../impl/journal/JournalStorageManager.java| 11 ---
.../impl/nullpm/NullStorageManager.java| 2 +-
.../artemis/core/protocol/ServerPacketDecoder.java | 2 +-
.../wireformat/ReplicationPageWriteMessage.java| 37 ++
.../core/replication/ReplicationEndpoint.java | 4 +--
.../core/replication/ReplicationManager.java | 4 +--
.../core/transaction/impl/TransactionImplTest.java | 2 +-
.../tests/integration/client/SendAckFailTest.java | 4 +--
.../integration/replication/ReplicationTest.java | 8 ++---
12 files changed, 54 insertions(+), 30 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
index ffd6e4e064..c940c83907 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
@@ -180,7 +180,7 @@ public final class Page {
public synchronized void write(final PagedMessage message) throws Exception
{
writeDirect(message);
- storageManager.pageWrite(message, pageId);
+ storageManager.pageWrite(storeName, message, pageId);
}
/** This write will not interact back with the storage manager.
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
index 55bc1e3fcd..ab3115f97e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
@@ -1535,7 +1535,7 @@ public class PagingStoreImpl implements PagingStore {
final long newPageId = currentPageId + 1;
if (logger.isTraceEnabled()) {
-logger.trace("new pageNr={}", newPageId);
+logger.trace("destination {} new pageNr={}", storeName, newPageId);
}
final Page oldPage = currentPage;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
index 81ca168588..4efa2101a4 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
@@ -126,11 +126,11 @@ public interface StorageManager extends IDGenerator,
ActiveMQComponent {
// Message related operations
- void pageClosed(SimpleString storeName, long pageNumber);
+ void pageClosed(SimpleString address, long pageNumber);
- void pageDeleted(SimpleString storeName, long pageNumber);
+ void pageDeleted(SimpleString address, long pageNumber);
- void pageWrite(PagedMessage message, long pageNumber);
+ void pageWrite(SimpleString address, PagedMessage message, long pageNumber);
void afterCompleteOperations(IOCallback run);
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index 86bcdfe485..827cc5ff89 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -394,7 +394,7 @@ public class JournalStorageManager extends
AbstractJournalStorageManager {
}
@Override
- public void pageWrite(final PagedMessage message, final long pageNumber) {
+ public void pageWrite(final SimpleString address, final PagedMessage
message, final long pageNumber) {
if (messageJournal.isHistory()) {
try (ArtemisCloseable lock = closeableReadLock()) {
@@ -421,7 +421,7 @@ public class JournalStorageManager extends
AbstractJournalStorageManager {
try (ArtemisCloseable lock
(activemq-artemis) 01/02: ARTEMIS-4925 Test with mirror and replication.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 5af90578cb155e9456745d63d632b0b65eb27ac0
Author: Clebert Suconic
AuthorDate: Mon Jul 15 23:39:23 2024 -0400
ARTEMIS-4925 Test with mirror and replication.
Files will leak on the target and messages will not be received after
failover.
Also messages will be written to wrong destinations on the replica. The
leak is actually between destinations, and the consequence is the file leak.
I usually keep test and fix on the same commit, but in this case I have
been heavily validating the server with and without the fix,
so I will open an exception in this case and keep the fix and test
separated.
---
.../api/core/management/SimpleManagement.java | 18 +
.../mirror/ReplicatedBothNodesMirrorTest.java | 413 +
2 files changed, 431 insertions(+)
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/SimpleManagement.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/SimpleManagement.java
index ece36b40b7..5152b36e4e 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/SimpleManagement.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/SimpleManagement.java
@@ -20,6 +20,7 @@ package org.apache.activemq.artemis.api.core.management;
import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -85,6 +86,10 @@ public class SimpleManagement implements AutoCloseable {
return simpleManagementLong("broker", "getCurrentTimeMillis");
}
+ public boolean isReplicaSync() throws Exception {
+ return simpleManagementBoolean("broker", "isReplicaSync");
+ }
+
public void rebuildPageCounters() throws Exception {
simpleManagementVoid("broker", "rebuildPageCounters");
}
@@ -103,6 +108,13 @@ public class SimpleManagement implements AutoCloseable {
return responseLong.get();
}
+ /** Simple helper for management returning a long.*/
+ public boolean simpleManagementBoolean(String resource, String method,
Object... parameters) throws Exception {
+ AtomicBoolean responseBoolean = new AtomicBoolean();
+ doManagement((m) -> setupCall(m, resource, method, parameters), m ->
setBooleanResult(m, responseBoolean), SimpleManagement::failed);
+ return responseBoolean.get();
+ }
+
/** Simple helper for management void calls.*/
public void simpleManagementVoid(String resource, String method, Object...
parameters) throws Exception {
doManagement((m) -> setupCall(m, resource, method, parameters), null,
SimpleManagement::failed);
@@ -191,6 +203,12 @@ public class SimpleManagement implements AutoCloseable {
result.set(resultLong);
}
+ protected static void setBooleanResult(ClientMessage m, AtomicBoolean
result) throws Exception {
+ boolean resultBoolean = (boolean)ManagementHelper.getResult(m,
Boolean.class);
+ logger.debug("management result:: {}", resultBoolean);
+ result.set(resultBoolean);
+ }
+
protected static void setIntResult(ClientMessage m, AtomicInteger result)
throws Exception {
int resultInt = (int)ManagementHelper.getResult(m, Integer.class);
logger.debug("management result:: {}", resultInt);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
new file mode 100644
index 00..8a40036db2
--- /dev/null
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
@@ -0,0 +1,413 @@
+/*
+ * 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, eithe
(activemq-artemis) branch main updated: NO-JIRA change one-test.sh to redirect test output to System.out
This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new 2f39db8270 NO-JIRA change one-test.sh to redirect test output to System.out 2f39db8270 is described below commit 2f39db8270e6da649f0f193fb260c2ac3ee975ea Author: Clebert Suconic AuthorDate: Wed Jul 10 10:03:29 2024 -0400 NO-JIRA change one-test.sh to redirect test output to System.out --- scripts/one-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/one-test.sh b/scripts/one-test.sh index a963f3d917..e3a3aea25f 100755 --- a/scripts/one-test.sh +++ b/scripts/one-test.sh @@ -16,4 +16,4 @@ # specific language governing permissions and limitations # under the License. -mvn -Ptests -DfailIfNoTests=false -Ptests-retry -DskipStyleCheck=true -DskipPerformanceTests=false -DskipSoakTests=false -Dtest=$1 test +mvn -Ptests -DfailIfNoTests=false -Ptests-retry -DskipStyleCheck=true -Dmaven.test.redirectTestOutputToFile=false -DskipPerformanceTests=false -DskipSoakTests=false -Dtest=$1 test - To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org For additional commands, e-mail: commits-h...@activemq.apache.org For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) branch main updated: ARTEMIS-3509 Concurrent Modification Exception on Stomp Transactions
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 0327fc31d8 ARTEMIS-3509 Concurrent Modification Exception on Stomp
Transactions
0327fc31d8 is described below
commit 0327fc31d8447263e49cd5d5a2cef39a139156bd
Author: Clebert Suconic
AuthorDate: Fri Jul 5 12:31:49 2024 -0400
ARTEMIS-3509 Concurrent Modification Exception on Stomp Transactions
Co-authored with Anant Sony
---
.../core/protocol/stomp/StompProtocolManager.java | 2 +-
.../artemis/core/protocol/stomp/StompSession.java | 16 +-
.../stomp/util/AbstractStompClientConnection.java | 4 +-
tests/soak-tests/pom.xml | 5 +
.../artemis/tests/soak/stomp/StompSoakTest.java| 183 +
5 files changed, 205 insertions(+), 5 deletions(-)
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
index f6ff139851..26917ac25f 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
@@ -244,7 +244,7 @@ public class StompProtocolManager extends
AbstractProtocolManager sessions, Object id, boolean transacted) throws
Exception {
StompSession stompSession = sessions.get(id);
if (stompSession == null) {
- stompSession = new StompSession(connection, this,
server.getStorageManager().newContext(server.getExecutorFactory().getExecutor()));
+ stompSession = new StompSession(connection, this,
server.getStorageManager().newContext(connection.getTransportConnection().getEventLoop()));
String name = UUIDGenerator.getInstance().generateStringUUID();
final String validatedUser =
server.validateUser(connection.getLogin(), connection.getPasscode(),
connection, getSecurityDomain());
ServerSession session = server.createSession(name,
connection.getLogin(), connection.getPasscode(),
ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, connection, !transacted, false,
false, false, null, stompSession, true, server.newOperationContext(),
getPrefixes(), getSecurityDomain(), validatedUser, false);
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
index a6d6465393..b0f75e08e7 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
@@ -26,6 +26,7 @@ import java.util.concurrent.BlockingDeque;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingDeque;
+import io.netty.channel.EventLoop;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException;
import org.apache.activemq.artemis.api.core.ICoreMessage;
@@ -85,6 +86,8 @@ public class StompSession implements SessionCallback {
private boolean txPending = false;
+ private final EventLoop eventLoop;
+
public synchronized void begin() {
txPending = true;
}
@@ -101,6 +104,7 @@ public class StompSession implements SessionCallback {
this.connection = connection;
this.manager = manager;
this.sessionContext = sessionContext;
+ eventLoop = connection.getTransportConnection().getEventLoop();
}
@Override
@@ -177,9 +181,15 @@ public class StompSession implements SessionCallback {
afterDeliveryTasks.offer(new PendingTask() {
@Override
public void run() throws Exception {
- //we ack and commit only if the send is successful
- session.acknowledge(consumerID, messageID);
- session.commit();
+ eventLoop.execute(() -> {
+try {
+ //we ack and commit only if the send is successful
+ session.acknowledge(consumerID, messageID);
+ session.commit();
+} catch (Throwable e) {
+ logger.warn(e.getMessage(), e);
+}
+ });
}
});
}
diff --
(activemq-artemis) branch main updated: ARTEMIS-4832: direct test output to file, make results more visible
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 68155867b6 ARTEMIS-4832: direct test output to file, make results more
visible
68155867b6 is described below
commit 68155867b6947a8fb41ba11b14f6bac79e8f3c20
Author: Robbie Gemmell
AuthorDate: Fri Jun 21 14:05:06 2024 +0100
ARTEMIS-4832: direct test output to file, make results more visible
Archive test logs upon GHA CI job failure to allow inspection.
Output to console can be enabled on request with e.g:
mvn test -Dmaven.test.redirectTestOutputToFile=false
---
.github/workflows/build.yml | 8
pom.xml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46db49b1b1..3e72a01ed1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,6 +64,14 @@ jobs:
rm -rf ~/.m2/repository/org/apache/activemq/examples
if [ -d ~/.m2/repository/org/apache/activemq ]; then find
~/.m2/repository/org/apache/activemq -name "*-SNAPSHOT" -type d -prune -exec rm
-r '{}' \; ; fi
+ - name: Archive Test Logs
+if: failure()
+uses: actions/upload-artifact@v4
+with:
+ name: surefire-reports-jdk-${{ matrix.java }}
+ path: activemq-artemis/**/target/surefire-reports/*
+ retention-days: 10
+
checks:
name: Checks (${{ matrix.java }})
runs-on: ubuntu-22.04
diff --git a/pom.xml b/pom.xml
index 5ee8d1ccfd..a58b54d5af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,7 +220,7 @@
UTF-8
false
-
false
+
true
(activemq-artemis) branch main updated: ARTEMIS-4814 Speeding up WildcardAddressManagerUnitTest::testConcurrentCalls2
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 925e338874 ARTEMIS-4814 Speeding up
WildcardAddressManagerUnitTest::testConcurrentCalls2
925e338874 is described below
commit 925e33887400b71a5d5ccb8fecd0b7466bbed417
Author: Clebert Suconic
AuthorDate: Thu Jun 20 11:45:16 2024 -0400
ARTEMIS-4814 Speeding up
WildcardAddressManagerUnitTest::testConcurrentCalls2
This test is spinning a concurrent call on getDirectBindings
Since I added a synchronization point to get the Bindings the test could
be taking up to 5 seconds, being a variance between 500ms and 5 seconds.
Adding Thread.sleep(1) on this loop solved the issue as it is now letting
other threads to do work
since I'm starting more executors than cores I have on my box.
---
.../unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java | 6 ++
1 file changed, 6 insertions(+)
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
index d381cf7d29..b4643b7de9 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
@@ -408,6 +408,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
CountDownLatch latch = new CountDownLatch(threads);
+ CountDownLatch latch2 = new CountDownLatch(1);
AtomicInteger errors = new AtomicInteger(0);
AtomicBoolean running = new AtomicBoolean(true);
@@ -418,10 +419,13 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
while (running.get()) {
// just to make things worse
simpleAddressManager.getDirectBindings(addressSimpleString);
+ Thread.sleep(1);
}
} catch (Exception e) {
logger.warn(e.getMessage(), e);
errors.incrementAndGet();
+ } finally {
+latch2.countDown();
}
});
@@ -451,6 +455,8 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
running.set(false);
+ Assertions.assertTrue(latch2.await(1, TimeUnit.MINUTES));
+
Assertions.assertEquals(0, errors.get());
Collection bindings =
simpleAddressManager.getDirectBindings(SimpleString.of(address));
-
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
