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

ARTEMIS-5173 Trying another test fix

This commit is contained in:
Clebert Suconic 2024-12-12 17:51:15 -05:00
parent a2357b9d6d
commit c680356717
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
View File

@ -70,6 +70,7 @@ import org.apache.activemq.artemis.utils.ConfirmationWindowWarning;
import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.PasswordMaskingUtil;
import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
import org.apache.activemq.artemis.utils.actors.OrderedExecutorFactory;
import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
import org.slf4j.Logger;
@ -117,7 +118,7 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
private final ScheduledExecutorService scheduledThreadPool;
private final Executor closeExecutor;
private final ArtemisExecutor closeExecutor;
private final Executor flowControlExecutor;
@ -1566,4 +1567,8 @@ public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, C
serverLocator.notifyNodeDown(eventTime, nodeID, disconnect);
}
}
public void flushCloseExecutor(int time, TimeUnit unit) {
closeExecutor.flush(time, unit);
}
}

5
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedMultipleServerFailoverExtraBackupsTest.java
View File

@ -31,6 +31,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.FailoverEventType;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.ReplicationBackupPolicyConfiguration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
@ -160,6 +161,7 @@ public class ReplicatedMultipleServerFailoverExtraBackupsTest extends Replicated
CountDownLatch failoverHappened = new CountDownLatch(1);
session0.addFailoverListener((FailoverEventType type) -> {
new Exception("Type::" + type).printStackTrace();
if (type == FailoverEventType.FAILOVER_COMPLETED) {
failoverHappened.countDown();
}
@ -173,6 +175,9 @@ public class ReplicatedMultipleServerFailoverExtraBackupsTest extends Replicated
assertTrue(failoverHappened.await(10, TimeUnit.SECONDS));
((ClientSessionFactoryImpl)session0.getSessionFactory()).flushCloseExecutor(10, TimeUnit.SECONDS);
((ClientSessionFactoryImpl)session1.getSessionFactory()).flushCloseExecutor(10, TimeUnit.SECONDS);
ClientConsumer consumer0 = session0.createConsumer(ADDRESS);
ClientConsumer consumer1 = session1.createConsumer(ADDRESS);
session0.start();