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

NO-JIRA Fixing ReplicatedFailoverTest testFailBack

This commit is contained in:
Clebert Suconic 2018-05-07 17:21:17 -04:00
parent 93a868c117
commit 50e170b7ec
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
View File

@ -1356,10 +1356,12 @@ public abstract class ActiveMQTestBase extends Assert {
break; break;
} }
if (System.currentTimeMillis() > (time + toWait)) { if (System.currentTimeMillis() > (time + toWait)) {
String threadDump = threadDump("can't get synchronization finished " + backup.isReplicaSync());
System.err.println(threadDump);
fail("backup started? (" + actualServer.isStarted() + "). Finished synchronizing (" + fail("backup started? (" + actualServer.isStarted() + "). Finished synchronizing (" +
(activation) + "). SessionFactory!=null ? " + (sessionFactory != null) + (activation) + "). SessionFactory!=null ? " + (sessionFactory != null) +
" || sessionFactory.getBackupConnector()==" + " || sessionFactory.getBackupConnector()==" +
(sessionFactory != null ? sessionFactory.getBackupConnector() : "not-applicable")); (sessionFactory != null ? sessionFactory.getBackupConnector() : "not-applicable") + "\n" + threadDump);
} }
try { try {
Thread.sleep(100); Thread.sleep(100);

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

@ -29,10 +29,12 @@ import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.component.WebServerComponent; import org.apache.activemq.artemis.component.WebServerComponent;
import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration; import org.apache.activemq.artemis.core.config.ha.ReplicaPolicyConfiguration;
import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration; import org.apache.activemq.artemis.core.config.ha.ReplicatedPolicyConfiguration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ServiceComponent; import org.apache.activemq.artemis.core.server.ServiceComponent;
import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy; import org.apache.activemq.artemis.core.server.cluster.ha.ReplicatedPolicy;
import org.apache.activemq.artemis.dto.AppDTO; import org.apache.activemq.artemis.dto.AppDTO;
import org.apache.activemq.artemis.dto.WebServerDTO; import org.apache.activemq.artemis.dto.WebServerDTO;
import org.apache.activemq.artemis.junit.Wait;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@ -47,14 +49,30 @@ public class ReplicatedFailoverTest extends FailoverTest {
public TestRule watcher = new TestWatcher() { public TestRule watcher = new TestWatcher() {
@Override @Override
protected void starting(Description description) { protected void starting(Description description) {
isReplicatedFailbackTest = description.getMethodName().equals("testReplicatedFailback"); isReplicatedFailbackTest = description.getMethodName().equals("testReplicatedFailback") || description.getMethodName().equals("testLoop");
} }
}; };
/* @Test
public void testLoop() throws Throwable {
for (int i = 0; i < 100; i++) {
System.err.println("#Test " + i);
testReplicatedFailback();
tearDown();
setUp();
}
} */
protected void beforeWaitForRemoteBackupSynchronization() { protected void beforeWaitForRemoteBackupSynchronization() {
} }
private void waitForSync(ActiveMQServer server) throws Exception {
Wait.waitFor(server::isReplicaSync);
}
@Test(timeout = 120000) @Test(timeout = 120000)
/* /*
* default maxSavedReplicatedJournalsSize is 2, this means the backup will fall back to replicated only twice, after this * default maxSavedReplicatedJournalsSize is 2, this means the backup will fall back to replicated only twice, after this
@ -64,7 +82,7 @@ public class ReplicatedFailoverTest extends FailoverTest {
try { try {
beforeWaitForRemoteBackupSynchronization(); beforeWaitForRemoteBackupSynchronization();
waitForRemoteBackupSynchronization(backupServer.getServer()); waitForSync(backupServer.getServer());
createSessionFactory(); createSessionFactory();
@ -80,9 +98,9 @@ public class ReplicatedFailoverTest extends FailoverTest {
liveServer.start(); liveServer.start();
waitForRemoteBackupSynchronization(liveServer.getServer()); waitForSync(liveServer.getServer());
waitForRemoteBackupSynchronization(backupServer.getServer()); waitForSync(backupServer.getServer());
waitForServerToStart(liveServer.getServer()); waitForServerToStart(liveServer.getServer());
@ -96,9 +114,9 @@ public class ReplicatedFailoverTest extends FailoverTest {
liveServer.start(); liveServer.start();
waitForRemoteBackupSynchronization(liveServer.getServer()); waitForSync(liveServer.getServer());
waitForRemoteBackupSynchronization(backupServer.getServer()); waitForSync(backupServer.getServer());
waitForServerToStart(liveServer.getServer()); waitForServerToStart(liveServer.getServer());
@ -112,11 +130,11 @@ public class ReplicatedFailoverTest extends FailoverTest {
liveServer.start(); liveServer.start();
waitForServerToStart(liveServer.getServer()); waitForSync(liveServer.getServer());
backupServer.getServer().waitForActivation(5, TimeUnit.SECONDS); backupServer.getServer().waitForActivation(5, TimeUnit.SECONDS);
waitForRemoteBackupSynchronization(liveServer.getServer()); waitForSync(liveServer.getServer());
waitForServerToStart(backupServer.getServer()); waitForServerToStart(backupServer.getServer());
@ -180,6 +198,7 @@ public class ReplicatedFailoverTest extends FailoverTest {
} }
} }
@Override @Override
protected void createConfigs() throws Exception { protected void createConfigs() throws Exception {
createReplicatedConfigs(); createReplicatedConfigs();