[activemq-artemis] branch master updated: NO-JIRA Fixing intermittent failure on PagingReceiveTest

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 06276ff  NO-JIRA Fixing intermittent failure on PagingReceiveTest
06276ff is described below

commit 06276ff26f617fd7e98ec3dbdf3133bc2a6a6282
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Thu May 28 12:41:19 2020 -0400

    NO-JIRA Fixing intermittent failure on PagingReceiveTest
---
 .../artemis/core/paging/cursor/impl/PageSubscriptionImpl.java       | 6 ++++++
 .../artemis/tests/integration/paging/PagingReceiveTest.java         | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 49b7b45..b63a0b9 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
@@ -57,6 +57,7 @@ import 
org.apache.activemq.artemis.core.transaction.Transaction;
 import 
org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract;
 import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes;
 import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl;
+import org.apache.activemq.artemis.utils.FutureLatch;
 import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
 import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
 import org.apache.activemq.artemis.utils.collections.ConcurrentLongHashMap;
@@ -72,6 +73,11 @@ public final class PageSubscriptionImpl implements 
PageSubscription {
 
    private boolean empty = true;
 
+   /** for tests */
+   public AtomicInteger getScheduledCleanupCount() {
+      return scheduledCleanupCount;
+   }
+
    // Number of scheduled cleanups, to avoid too many schedules
    private final AtomicInteger scheduledCleanupCount = new AtomicInteger(0);
 
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java
index 7c0c4c8..18c702c 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingReceiveTest.java
@@ -64,7 +64,8 @@ public class PagingReceiveTest extends ActiveMQTestBase {
       Queue queue = server.locateQueue(ADDRESS);
       assertEquals(numMsgs, queue.getMessagesAdded());
       receiveAllMessages();
-      queue.getPageSubscription().cleanupEntries(true);
+      queue.getPageSubscription().scheduleCleanupCheck();
+      Wait.assertEquals(0, 
((PageSubscriptionImpl)queue.getPageSubscription()).getScheduledCleanupCount()::get);
       assertEquals(numMsgs, queue.getMessagesAdded());
    }