[hornetq-commits] JBoss hornetq SVN: r9644 - in branches/2_2_0_HA_Improvements: tests/src/org/hornetq/tests/integration/cluster/failover and 2 other directories.

Author: jmesnil Date: 2010-09-06 04:19:17 -0400 (Mon, 06 Sep 2010) New Revision: 9644 Added: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteFailoverTest.java Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: fix SharedStoreBackupActivation to prevent the backup to activate if the live node was shutdown cleanly refactor failover test to be able to run them using remote process' hornetq servers and real file locks Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -28,8 +28,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; -import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -582,15 +582,15 @@ log.info("Backup server is up - waiting for failover"); liveLock.lock(); - //todo check if we need this or not + // We need to test if the file exists again, since the live might have shutdown - // if (!liveLockFile.exists()) - // { - // liveLock.unlock(); - - // continue; - // } - + if (!liveLockFile.exists()) + { + liveLock.unlock(); + + continue; + } + log.info("Backup server obtained live lock"); // Announce presence of live node to cluster Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -200,7 +200,7 @@ // Simulate failure on connection synchronized (lockFail) { - fail((ClientSession) createSession); + crash((ClientSession) createSession); } /*if (listener != null) Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -108,7 +108,7 @@ producer.send(message); } - fail(session); + crash(session); ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS); @@ -188,19 +188,18 @@ if (i == 5) { - fail(session); + crash(session); } } - boolean exception = false; - try { session.commit(); + fail("session must have rolled back on failover"); } catch (HornetQException e) { - exception = true; + assertTrue(e.getCode() == HornetQException.TRANSACTION_ROLLED_BACK); } consumer.close(); @@ -220,8 +219,6 @@ session.commit(); - assertTrue("Exception was expected!", exception); - session.close(); sf.close(); @@ -267,14 +264,12 @@ session.close(); - server1Service.stop(); - server0Service.stop(); + liveServer.stop(); FakeLockFile.clearLocks(); - server1Service.start(); - server0Service.start(); + liveServer.start(); - sf = (ClientSessionFactoryInternal) locator.createSessionFactory(); - + sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); + session = sf.createSession(true, true); ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS); @@ -316,10 +311,9 @@ ClientSessionFactoryInternal sf = createSessionFactoryAndWaitForTopology(locator, 2); - // Stop live server + // Crash live server + crash(); - this.server0Service.stop(); - ClientSession session = sf.createSession(); session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); @@ -365,9 +359,6 @@ Assert.assertEquals(0, sf.numConnections()); } - - - public void testTransactedMessagesSentSoRollback() throws Exception { ServerLocator locator = getServerLocator(); @@ -398,7 +389,7 @@ producer.send(message); } - fail(session); + crash(session); Assert.assertTrue(session.isRollbackOnly()); @@ -464,7 +455,7 @@ producer.send(message); } - fail(session); + crash(session); Assert.assertTrue(session.isRollbackOnly()); @@ -540,7 +531,7 @@ session.commit(); - fail(session); + crash(session); // committing again should work since didn't send anything since last commit @@ -623,7 +614,7 @@ Assert.assertFalse(session.isRollbackOnly()); - fail(session); + crash(session); session.commit(); @@ -717,7 +708,7 @@ message.acknowledge(); } - fail(session2); + crash(session2); Assert.assertTrue(session2.isRollbackOnly()); @@ -798,7 +789,7 @@ consumer.close(); - fail(session2); + crash(session2); Assert.assertFalse(session2.isRollbackOnly()); @@ -866,7 +857,7 @@ producer.send(message); } - fail(session); + crash(session); try { @@ -932,7 +923,7 @@ session.end(xid, XAResource.TMSUCCESS); - fail(session); + crash(session); try { @@ -1001,7 +992,7 @@ session.prepare(xid); - fail(session); + crash(session); try { @@ -1071,7 +1062,7 @@ session.commit(xid, false); - fail(session); + crash(session); ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS); @@ -1169,7 +1160,7 @@ message.acknowledge(); } - fail(session2); + crash(session2); try { @@ -1250,7 +1241,7 @@ session2.end(xid, XAResource.TMSUCCESS); - fail(session2); + crash(session2); try { @@ -1333,7 +1324,7 @@ session2.prepare(xid); - fail(session2); + crash(session2); try { @@ -1368,7 +1359,7 @@ ClientSession session = sendAndConsume(sf, true); - fail(session); + crash(session); session.close(); @@ -1444,7 +1435,7 @@ Set<ClientSession> sessionSet = sessionConsumerMap.keySet(); ClientSession[] sessions = new ClientSession[sessionSet.size()]; sessionSet.toArray(sessions); - fail(sessions); + crash(sessions); for (ClientSession session : sessionConsumerMap.keySet()) @@ -1532,7 +1523,7 @@ Assert.assertEquals(i, message.getIntProperty("counter").intValue()); } - fail(session); + crash(session); for (int i = 0; i < numMessages; i++) { @@ -1606,7 +1597,7 @@ Assert.assertEquals(i, message.getIntProperty("counter").intValue()); } - fail(session); + crash(session); // Should get the same ones after failover since we didn't ack @@ -1684,7 +1675,7 @@ message.acknowledge(); } - fail(session); + crash(session); // Send some more @@ -1774,7 +1765,7 @@ session.start(); - fail(session); + crash(session); for (int i = 0; i < numMessages; i++) { @@ -1809,7 +1800,7 @@ Assert.assertEquals(0, sf.numConnections()); } - public void testForceBlockingReturn() throws Exception + public void _testForceBlockingReturn() throws Exception { ServerLocator locator = getServerLocator(); locator.setBlockOnNonDurableSend(true); @@ -1821,7 +1812,7 @@ // Add an interceptor to delay the send method so we can get time to cause failover before it returns - server0Service.getRemotingService().addInterceptor(new DelayInterceptor()); + //liveServer.getRemotingService().addInterceptor(new DelayInterceptor()); @@ -1859,7 +1850,7 @@ Thread.sleep(500); - fail(session); + crash(session); sender.join(); @@ -1966,7 +1957,7 @@ Thread.sleep(500); - fail(session); + crash(session); committer.join(); @@ -2069,7 +2060,7 @@ try { - server0Service.getRemotingService().addInterceptor(interceptor); + //liveServer.getRemotingService().addInterceptor(interceptor); session.commit(); } @@ -2079,7 +2070,7 @@ { // Ok - now we retry the commit after removing the interceptor - server0Service.getRemotingService().removeInterceptor(interceptor); + //liveServer.getRemotingService().removeInterceptor(interceptor); try { @@ -2103,7 +2094,7 @@ Thread.sleep(500); - fail(session); + crash(session); committer.join(); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -26,8 +26,11 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.*; -import org.hornetq.core.client.impl.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClusterTopologyListener; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.ServerLocator; +import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ServerLocatorInternal; import org.hornetq.core.config.BackupConnectorConfiguration; @@ -36,11 +39,10 @@ import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.remoting.impl.invm.TransportConstants; -import org.hornetq.core.server.ActivateCallback; -import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.impl.FakeLockFile; +import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; +import org.hornetq.tests.integration.cluster.util.TestableServer; import org.hornetq.tests.util.ServiceTestBase; -import org.hornetq.tests.util.UnitTestCase; /** * A FailoverTestBase @@ -57,10 +59,14 @@ // Attributes ---------------------------------------------------- - protected HornetQServer server0Service; + protected TestableServer liveServer; - protected HornetQServer server1Service; + protected TestableServer backupServer; + protected Configuration backupConfig; + + protected Configuration liveConfig; + // Static -------------------------------------------------------- // Constructors -------------------------------------------------- @@ -91,35 +97,48 @@ FakeLockFile.clearLocks(); createConfigs(); - if (server1Service != null) + if (backupServer != null) { - server1Service.start(); + backupServer.start(); } - server0Service.start(); + liveServer.start(); + } + protected TestableServer createLiveServer() + { + return new SameProcessHornetQServer(createFakeLockServer(true, liveConfig)); + } + + protected TestableServer createBackupServer() + { + return new SameProcessHornetQServer(createFakeLockServer(true, backupConfig)); + } + /** * @throws Exception */ protected void createConfigs() throws Exception { - Configuration config1 = super.createDefaultConfig(); - config1.getAcceptorConfigurations().clear(); - config1.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(false)); - config1.setSecurityEnabled(false); - config1.setSharedStore(true); - config1.setBackup(true); - config1.setClustered(true); + backupConfig = super.createDefaultConfig(); + backupConfig.getAcceptorConfigurations().clear(); + backupConfig.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(false)); + backupConfig.setSecurityEnabled(false); + backupConfig.setSharedStore(true); + backupConfig.setBackup(true); + backupConfig.setClustered(true); TransportConfiguration liveConnector = getConnectorTransportConfiguration(true); TransportConfiguration backupConnector = getConnectorTransportConfiguration(false); - config1.getConnectorConfigurations().put(liveConnector.getName(), liveConnector); - config1.getConnectorConfigurations().put(backupConnector.getName(), backupConnector); + backupConfig.getConnectorConfigurations().put(liveConnector.getName(), liveConnector); + backupConfig.getConnectorConfigurations().put(backupConnector.getName(), backupConnector); ArrayList<String> staticConnectors = new ArrayList<String>(); staticConnectors.add(liveConnector.getName()); - config1.setBackupConnectorConfiguration(new BackupConnectorConfiguration(staticConnectors, backupConnector.getName())); - server1Service = createFakeLockServer(true, config1); + backupConfig.setBackupConnectorConfiguration(new BackupConnectorConfiguration(staticConnectors, backupConnector.getName())); + backupServer = createBackupServer(); + // FIXME + /* server1Service.registerActivateCallback(new ActivateCallback() { @@ -133,27 +152,26 @@ { try { - server0Service.getStorageManager().stop(); + liveServer.getStorageManager().stop(); } catch (Exception ignored) { } } }); - - Configuration config0 = super.createDefaultConfig(); - config0.getAcceptorConfigurations().clear(); - config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); - config0.setSecurityEnabled(false); - config0.setSharedStore(true); - config0.setClustered(true); +*/ + liveConfig = super.createDefaultConfig(); + liveConfig.getAcceptorConfigurations().clear(); + liveConfig.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); + liveConfig.setSecurityEnabled(false); + liveConfig.setSharedStore(true); + liveConfig.setClustered(true); List<String> pairs = null; ClusterConnectionConfiguration ccc0 = new ClusterConnectionConfiguration("cluster1", "jms", liveConnector.getName(), -1, false, false, 1, 1, pairs); - config0.getClusterConfigurations().add(ccc0); - config0.getConnectorConfigurations().put(liveConnector.getName(), liveConnector); - server0Service = createFakeLockServer(true, config0); - + liveConfig.getClusterConfigurations().add(ccc0); + liveConfig.getConnectorConfigurations().put(liveConnector.getName(), liveConnector); + liveServer = createLiveServer(); } protected void createReplicatedConfigs() throws Exception @@ -168,34 +186,34 @@ config1.setSecurityEnabled(false); config1.setSharedStore(false); config1.setBackup(true); - server1Service = super.createServer(true, config1); - + backupServer = createBackupServer(); + Configuration config0 = super.createDefaultConfig(); config0.getAcceptorConfigurations().clear(); config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); config0.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); - //config0.setBackupConnectorName("toBackup"); + //liveConfig.setBackupConnectorName("toBackup"); config0.setSecurityEnabled(false); config0.setSharedStore(false); - server0Service = super.createServer(true, config0); + liveServer = createLiveServer(); - server1Service.start(); - server0Service.start(); + backupServer.start(); + liveServer.start(); } @Override protected void tearDown() throws Exception { - server1Service.stop(); + backupServer.stop(); - server0Service.stop(); + liveServer.stop(); Assert.assertEquals(0, InVMRegistry.instance.size()); - server1Service = null; + backupServer = null; - server0Service = null; + liveServer = null; InVMConnector.failOnCreateConnection = false; @@ -220,7 +238,7 @@ { long time = System.currentTimeMillis(); long toWait = seconds * 1000; - while(!server1Service.isInitialised()) + while(!backupServer.isInitialised()) { try { @@ -230,7 +248,7 @@ { //ignore } - if(server1Service.isInitialised()) + if(backupServer.isInitialised()) { break; } @@ -320,29 +338,11 @@ return (ServerLocatorInternal) locator; } - protected void fail(final ClientSession... sessions) throws Exception + protected void crash(final ClientSession... sessions) throws Exception { - final CountDownLatch latch = new CountDownLatch(sessions.length); - - class MyListener extends BaseListener - { - public void connectionFailed(final HornetQException me) - { - latch.countDown(); - } - - } - for (ClientSession session : sessions) - { - session.addFailureListener(new MyListener()); - } - server0Service.stop(); - - // Wait to be informed of failure - boolean ok = latch.await(10000, TimeUnit.MILLISECONDS); - - Assert.assertTrue(ok); + liveServer.crash(sessions); } + // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -14,6 +14,8 @@ package org.hornetq.tests.integration.cluster.failover; import org.hornetq.core.config.Configuration; +import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; +import org.hornetq.tests.integration.cluster.util.TestableServer; /** * A NettyReplicatedFailoverTest @@ -40,6 +42,18 @@ // Protected ----------------------------------------------------- @Override + protected TestableServer createLiveServer() + { + return new SameProcessHornetQServer(createServer(true, liveConfig)); + } + + @Override + protected TestableServer createBackupServer() + { + return new SameProcessHornetQServer(createServer(true, backupConfig)); + } + + @Override protected void createConfigs() throws Exception { Configuration config1 = super.createDefaultConfig(); @@ -50,20 +64,20 @@ config1.setSecurityEnabled(false); config1.setSharedStore(false); config1.setBackup(true); - server1Service = super.createServer(true, config1); - + backupServer = createBackupServer(); + Configuration config0 = super.createDefaultConfig(); config0.getAcceptorConfigurations().clear(); config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); - /*config0.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); - config0.setBackupConnectorName("toBackup");*/ + /*liveConfig.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); + liveConfig.setBackupConnectorName("toBackup");*/ config0.setSecurityEnabled(false); config0.setSharedStore(false); - server0Service = super.createServer(true, config0); - - server1Service.start(); - server0Service.start(); + liveServer = createLiveServer(); + + backupServer.start(); + liveServer.start(); } // Private ------------------------------------------------------- Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -31,6 +31,8 @@ import org.hornetq.core.server.impl.HornetQServerImpl; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.spi.core.protocol.RemotingConnection; +import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; +import org.hornetq.tests.integration.cluster.util.TestableServer; /** * A PagingFailoverTest @@ -75,6 +77,9 @@ public void internalTestPage(final boolean transacted, final boolean failBeforeConsume) throws Exception { + throw new Exception("must change the test to reflect the new replication code"); + + /* ServerLocator locator = getServerLocator(); locator.setBlockOnNonDurableSend(true); @@ -197,6 +202,7 @@ { } } + */ } /** @@ -248,6 +254,18 @@ new HashMap<String, AddressSettings>()); } + @Override + protected TestableServer createBackupServer() + { + return new SameProcessHornetQServer(createServer(true, backupConfig)); + } + + @Override + protected TestableServer createLiveServer() + { + return new SameProcessHornetQServer(createServer(true, liveConfig)); + } + /** * @throws Exception */ @@ -260,14 +278,14 @@ config1.setSecurityEnabled(false); config1.setSharedStore(true); config1.setBackup(true); - server1Service = createServer(true, config1); - + backupServer = createBackupServer(); + Configuration config0 = super.createDefaultConfig(); config0.getAcceptorConfigurations().clear(); config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); config0.setSecurityEnabled(false); config0.setSharedStore(true); - server0Service = createServer(true, config0); + liveServer = createLiveServer(); } Added: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteFailoverTest.java (rev 0) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/RemoteFailoverTest.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -0,0 +1,143 @@ +/* + * Copyright 2010 Red Hat, Inc. + * Red Hat 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.hornetq.tests.integration.cluster.failover; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory; +import org.hornetq.core.server.JournalType; +import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; +import org.hornetq.tests.integration.cluster.util.RemoteProcessHornetQServer; +import org.hornetq.tests.integration.cluster.util.RemoteProcessHornetQServerSupport; +import org.hornetq.tests.integration.cluster.util.RemoteServerConfiguration; +import org.hornetq.tests.integration.cluster.util.TestableServer; + +/** + * A RemoteFailoverTest + * + * @author jmesnil + * + * + */ +public class RemoteFailoverTest extends FailoverTest +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + public static class SharedLiveServerConfiguration extends RemoteServerConfiguration + { + + @Override + public Configuration getConfiguration() + { + Configuration config = createDefaultConfig(generateParams(0, true), NettyAcceptorFactory.class.getName()); + config.setJournalType(JournalType.NIO); + config.setSharedStore(true); + config.setClustered(true); + config.getConnectorConfigurations().put("self", + createTransportConfiguration(true, false, generateParams(0, true))); + config.getClusterConfigurations().add(new ClusterConnectionConfiguration("cluster", + "foo", + "self", + -1, + false, + false, + 1, + 1, + new ArrayList<String>())); + return config; + } + + } + + public static class SharedBackupServerConfiguration extends RemoteServerConfiguration + { + + @Override + public Configuration getConfiguration() + { + Configuration config = createDefaultConfig(generateParams(1, true), NettyAcceptorFactory.class.getName()); + config.setJournalType(JournalType.NIO); + config.setSharedStore(true); + config.setBackup(true); + config.setClustered(true); + config.setLiveConnectorName("live"); + config.getConnectorConfigurations().put("live", + createTransportConfiguration(true, false, generateParams(0, true))); + config.getConnectorConfigurations().put("self", + createTransportConfiguration(true, false, generateParams(1, true))); + List<String> connectors = new ArrayList<String>(); + connectors.add("live"); + config.getClusterConfigurations().add(new ClusterConnectionConfiguration("cluster", + "foo", + "self", + -1, + false, + false, + 1, + 1, + connectors)); + return config; + } + + } + + @Override + protected TestableServer createLiveServer() + { + return new RemoteProcessHornetQServer(SharedLiveServerConfiguration.class.getName()); + } + + @Override + protected TestableServer createBackupServer() + { + return new RemoteProcessHornetQServer(SharedBackupServerConfiguration.class.getName()); + } + + protected TransportConfiguration getConnectorTransportConfiguration(final boolean live) { + Map<String, Object> params = null; + if (live) + { + params = generateParams(0, true); + } else + { + params = generateParams(1, true); + } + return createTransportConfiguration(true, false, params); + } + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -14,6 +14,8 @@ package org.hornetq.tests.integration.cluster.failover; import org.hornetq.core.config.Configuration; +import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; +import org.hornetq.tests.integration.cluster.util.TestableServer; /** * A ReplicatedAsynchronousFailoverTest @@ -38,6 +40,17 @@ // Package protected --------------------------------------------- // Protected ----------------------------------------------------- + + protected TestableServer createLiveServer() + { + return new SameProcessHornetQServer(createServer(true, liveConfig)); + } + + protected TestableServer createBackupServer() + { + return new SameProcessHornetQServer(createServer(true, backupConfig)); + } + @Override protected void createConfigs() throws Exception { @@ -49,20 +62,20 @@ config1.setSecurityEnabled(false); config1.setSharedStore(false); config1.setBackup(true); - server1Service = super.createServer(true, config1); - + backupServer = createBackupServer(); + Configuration config0 = super.createDefaultConfig(); config0.getAcceptorConfigurations().clear(); config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); - /*config0.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); - config0.setBackupConnectorName("toBackup");*/ + /*liveConfig.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); + liveConfig.setBackupConnectorName("toBackup");*/ config0.setSecurityEnabled(false); config0.setSharedStore(false); - server0Service = super.createServer(true, config0); - - server1Service.start(); - server0Service.start(); + liveServer = createLiveServer(); + + backupServer.start(); + liveServer.start(); } // Private ------------------------------------------------------- Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -14,6 +14,8 @@ package org.hornetq.tests.integration.cluster.failover; import org.hornetq.core.config.Configuration; +import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; +import org.hornetq.tests.integration.cluster.util.TestableServer; /** * A ReplicatedNettyAsynchronousFailoverTest @@ -40,30 +42,42 @@ // Protected ----------------------------------------------------- @Override + protected TestableServer createLiveServer() + { + return new SameProcessHornetQServer(createServer(true, liveConfig)); + } + + @Override + protected TestableServer createBackupServer() + { + return new SameProcessHornetQServer(createServer(true, backupConfig)); + } + + @Override protected void createConfigs() throws Exception { - Configuration config1 = super.createDefaultConfig(); - config1.setBindingsDirectory(config1.getBindingsDirectory() + "_backup"); - config1.setJournalDirectory(config1.getJournalDirectory() + "_backup"); - config1.getAcceptorConfigurations().clear(); - config1.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(false)); - config1.setSecurityEnabled(false); - config1.setSharedStore(false); - config1.setBackup(true); - server1Service = super.createServer(true, config1); + backupConfig = super.createDefaultConfig(); + backupConfig.setBindingsDirectory(backupConfig.getBindingsDirectory() + "_backup"); + backupConfig.setJournalDirectory(backupConfig.getJournalDirectory() + "_backup"); + backupConfig.getAcceptorConfigurations().clear(); + backupConfig.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(false)); + backupConfig.setSecurityEnabled(false); + backupConfig.setSharedStore(false); + backupConfig.setBackup(true); + backupServer = createBackupServer(); + + liveConfig = super.createDefaultConfig(); + liveConfig.getAcceptorConfigurations().clear(); + liveConfig.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); - Configuration config0 = super.createDefaultConfig(); - config0.getAcceptorConfigurations().clear(); - config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); - - //config0.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); - //config0.setBackupConnectorName("toBackup"); - config0.setSecurityEnabled(false); - config0.setSharedStore(false); - server0Service = super.createServer(true, config0); - - server1Service.start(); - server0Service.start(); + //liveConfig.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); + //liveConfig.setBackupConnectorName("toBackup"); + liveConfig.setSecurityEnabled(false); + liveConfig.setSharedStore(false); + liveServer = createLiveServer(); + + backupServer.start(); + liveServer.start(); } // Private ------------------------------------------------------- Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -14,6 +14,8 @@ package org.hornetq.tests.integration.cluster.failover; import org.hornetq.core.config.Configuration; +import org.hornetq.tests.integration.cluster.util.SameProcessHornetQServer; +import org.hornetq.tests.integration.cluster.util.TestableServer; /** * A ReplicatedPagingFailoverTest @@ -40,33 +42,47 @@ // Protected ----------------------------------------------------- @Override - protected void createConfigs() throws Exception + protected TestableServer createBackupServer() { - Configuration config1 = super.createDefaultConfig(); - config1.setBindingsDirectory(config1.getBindingsDirectory() + "_backup"); - config1.setJournalDirectory(config1.getJournalDirectory() + "_backup"); - config1.setPagingDirectory(config1.getPagingDirectory() + "_backup"); - config1.getAcceptorConfigurations().clear(); - config1.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(false)); - config1.setSecurityEnabled(false); - config1.setSharedStore(false); - config1.setBackup(true); - server1Service = super.createServer(true, config1); + return new SameProcessHornetQServer(createServer(true, backupConfig)); - Configuration config0 = super.createDefaultConfig(); - config0.getAcceptorConfigurations().clear(); - config0.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); + } - /*config0.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); - config0.setBackupConnectorName("toBackup");*/ - config0.setSecurityEnabled(false); - config0.setSharedStore(false); - server0Service = super.createServer(true, config0); + @Override + protected TestableServer createLiveServer() + { + return new SameProcessHornetQServer(createServer(true, liveConfig)); - server1Service.start(); - server0Service.start(); } + @Override + protected void createConfigs() throws Exception + { + backupConfig = super.createDefaultConfig(); + backupConfig.setBindingsDirectory(backupConfig.getBindingsDirectory() + "_backup"); + backupConfig.setJournalDirectory(backupConfig.getJournalDirectory() + "_backup"); + backupConfig.setPagingDirectory(backupConfig.getPagingDirectory() + "_backup"); + backupConfig.getAcceptorConfigurations().clear(); + backupConfig.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(false)); + backupConfig.setSecurityEnabled(false); + backupConfig.setSharedStore(false); + backupConfig.setBackup(true); + backupServer = createBackupServer(); + + liveConfig = super.createDefaultConfig(); + liveConfig.getAcceptorConfigurations().clear(); + liveConfig.getAcceptorConfigurations().add(getAcceptorTransportConfiguration(true)); + + /*liveConfig.getConnectorConfigurations().put("toBackup", getConnectorTransportConfiguration(false)); + liveConfig.setBackupConnectorName("toBackup");*/ + liveConfig.setSecurityEnabled(false); + liveConfig.setSharedStore(false); + liveServer = createLiveServer(); + + backupServer.start(); + liveServer.start(); + } + // Private ------------------------------------------------------- // Inner classes ------------------------------------------------- Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/RemoteProcessHornetQServer.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -13,7 +13,14 @@ package org.hornetq.tests.integration.cluster.util; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import junit.framework.Assert; + +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.SessionFailureListener; /** * A RemoteProcessHornetQServer @@ -56,12 +63,34 @@ public void crash(ClientSession... sessions) throws Exception { + final CountDownLatch latch = new CountDownLatch(sessions.length); + + class MyListener implements SessionFailureListener + { + public void connectionFailed(final HornetQException me) + { + latch.countDown(); + } + + public void beforeReconnect(HornetQException exception) + { + } + } + for (ClientSession session : sessions) + { + session.addFailureListener(new MyListener()); + } + if (serverProcess != null) { RemoteProcessHornetQServerSupport.crash(serverProcess); serverProcess = null; - Thread.sleep(2000); } + + // Wait to be informed of failure + boolean ok = latch.await(10000, TimeUnit.MILLISECONDS); + + Assert.assertTrue(ok); } // Constants ----------------------------------------------------- Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/cluster/util/SameProcessHornetQServer.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -13,6 +13,7 @@ package org.hornetq.tests.integration.cluster.util; +import java.io.File; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -22,6 +23,8 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.cluster.impl.FakeLockFile; +import org.hornetq.tests.util.ServiceTestBase; /** * A SameProcessHornetQServer @@ -53,7 +56,6 @@ public void stop() throws Exception { server.stop(); - Thread.sleep(2000); } public void crash(ClientSession... sessions) throws Exception @@ -76,7 +78,12 @@ session.addFailureListener(new MyListener()); } server.stop(); - + // recreate the live.lock file (since it was deleted by the + // clean stop + File lockFile = new File(ServiceTestBase.getJournalDir(), "live.lock"); + Assert.assertFalse(lockFile.exists()); + lockFile.createNewFile(); + // Wait to be informed of failure boolean ok = latch.await(10000, TimeUnit.MILLISECONDS); Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-09-03 21:24:48 UTC (rev 9643) +++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-09-06 08:19:17 UTC (rev 9644) @@ -440,7 +440,7 @@ /** * @return the journalDir */ - protected static String getJournalDir() + public static String getJournalDir() { return getJournalDir(testDir); }