You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2025/04/07 17:17:53 UTC
(activemq-artemis) branch main updated (eb01d78245 -> f206fa1deb)
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 eb01d78245 ARTEMIS-5384 Proper cycle PagedTimeWriter during a server shutdown
new dbcad446cc NO-JIRA Fixing intermittent test failure
new f206fa1deb ARTEMIS-5385 Optimize checkDone on 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:
.../artemis/core/paging/cursor/impl/PageSubscriptionImpl.java | 10 ++++++----
.../artemis/tests/integration/amqp/AmqpLargeMessageTest.java | 3 +--
.../tests/soak/replicationflow/ReplicationFlowControlTest.java | 2 --
3 files changed, 7 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 01/02: NO-JIRA Fixing intermittent test failure
Posted by cl...@apache.org.
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 dbcad446cc2eaf0cbdba5529cd8eafa6afc27d2b
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Apr 7 12:21:20 2025 -0400
NO-JIRA Fixing intermittent test failure
---
.../activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java
index 9d57c9685f..e033dc9c2c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpLargeMessageTest.java
@@ -172,8 +172,7 @@ public class AmqpLargeMessageTest extends AmqpClientTestSupport {
try {
sendMessages(nMsgs, connection);
- int count = getMessageCount(server.getPostOffice(), testQueueName);
- assertEquals(nMsgs, count);
+ Wait.assertEquals(nMsgs, () -> getMessageCount(server.getPostOffice(), testQueueName), 5000, 100);
org.apache.activemq.artemis.core.server.Queue serverQueue = server.locateQueue(testQueueName);
serverQueue.forEach(ref -> {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact
(activemq-artemis) 02/02: ARTEMIS-5385 Optimize checkDone on Paging
Posted by cl...@apache.org.
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 f206fa1deb8470b036e90de4e91cf51e6b34f9f8
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Apr 7 12:04:28 2025 -0400
ARTEMIS-5385 Optimize checkDone on Paging
---
.../artemis/core/paging/cursor/impl/PageSubscriptionImpl.java | 10 ++++++----
.../tests/soak/replicationflow/ReplicationFlowControlTest.java | 2 --
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
index c674b6a26f..745a7da608 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
@@ -1079,15 +1079,17 @@ public final class PageSubscriptionImpl implements PageSubscription {
}
protected void checkDone() {
- if (isDone()) {
- onPageDone(this);
- }
+ pageStore.execute(() -> {
+ if (isDone()) {
+ onPageDone(this);
+ }
+ });
}
private int getNumberOfMessages() {
if (numberOfMessages < 0) {
try {
- Page page = pageStore.usePage(pageId, false);
+ Page page = pageStore.usePage(pageId, true, false);
if (page == null) {
page = pageStore.newPageObject(pageId);
diff --git a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/ReplicationFlowControlTest.java b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/ReplicationFlowControlTest.java
index 4def778305..624291cd2e 100644
--- a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/ReplicationFlowControlTest.java
+++ b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/ReplicationFlowControlTest.java
@@ -97,8 +97,6 @@ public class ReplicationFlowControlTest extends SoakTestBase {
@Override
public void after() throws Exception {
super.after();
- cleanupData(SERVER_NAME_0);
- cleanupData(SERVER_NAME_1);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact