November 2010 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r9934 - branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-11-26 09:58:09 -0500 (Fri, 26 Nov 2010) New Revision: 9934 Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java Log: set reconnect attempts on test Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-11-26 12:41:48 UTC (rev 9933) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-11-26 14:58:09 UTC (rev 9934) @@ -105,6 +105,7 @@ { locator.setBlockOnNonDurableSend(true); locator.setBlockOnDurableSend(true); + locator.setReconnectAttempts(-1); ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal)locator.createSessionFactory(); @@ -112,18 +113,7 @@ session.createQueue(FailoverTestBase.ADDRESS, FailoverTestBase.ADDRESS, null, true); - final CountDownLatch latch = new CountDownLatch(1); - class MyListener extends BaseListener - { - public void connectionFailed(final HornetQException me, final boolean failover) - { - latch.countDown(); - } - } - - session.addFailureListener(new MyListener()); - ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS); final int numMessages = 100;

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9933 - branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/ssl.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-11-26 07:41:48 -0500 (Fri, 26 Nov 2010) New Revision: 9933 Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java Log: fixed resource leak Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-11-26 12:38:11 UTC (rev 9932) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-11-26 12:41:48 UTC (rev 9933) @@ -85,6 +85,7 @@ Message m = consumer.receive(1000); Assert.assertNotNull(m); Assert.assertEquals(text, m.getBodyBuffer().readString()); + locator.close(); } public void testSSLWithIncorrectKeyStorePassword() throws Exception @@ -104,6 +105,10 @@ { Assert.assertEquals(HornetQException.NOT_CONNECTED, e.getCode()); } + finally + { + locator.close(); + } } // see https://jira.jboss.org/jira/browse/HORNETQ-234 @@ -124,6 +129,10 @@ { Assert.assertEquals(HornetQException.CONNECTION_TIMEDOUT, e.getCode()); } + finally + { + locator.close(); + } } // Package protected ---------------------------------------------

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9932 - in branches/2_2_0_HA_Improvements_preMerge: src/main/org/hornetq/core/client/impl and 2 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-11-26 07:38:11 -0500 (Fri, 26 Nov 2010) New Revision: 9932 Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/api/core/client/ServerLocator.java branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/client/impl/ServerLocatorInternal.java branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java Log: added initialconnectattempts to connection factory and fixed manual failover test Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/api/core/client/ServerLocator.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/api/core/client/ServerLocator.java 2010-11-26 11:28:20 UTC (rev 9931) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/api/core/client/ServerLocator.java 2010-11-26 12:38:11 UTC (rev 9932) @@ -563,7 +563,10 @@ * @param reconnectAttempts maximum number of attempts to retry connection in case of failure */ void setReconnectAttempts(int reconnectAttempts); - + + void setInitialConnectAttempts(int reconnectAttempts); + + int getInitialConnectAttempts(); /** * Returns true if the client will automatically attempt to connect to the backup server if the initial * connection to the live server fails Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2010-11-26 11:28:20 UTC (rev 9931) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2010-11-26 12:38:11 UTC (rev 9932) @@ -871,6 +871,11 @@ this.initialConnectAttempts = initialConnectAttempts; } + public int getInitialConnectAttempts() + { + return initialConnectAttempts; + } + public synchronized boolean isFailoverOnInitialConnection() { return this.failoverOnInitialConnection; Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/client/impl/ServerLocatorInternal.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/client/impl/ServerLocatorInternal.java 2010-11-26 11:28:20 UTC (rev 9931) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/client/impl/ServerLocatorInternal.java 2010-11-26 12:38:11 UTC (rev 9932) @@ -54,7 +54,5 @@ void setBackup(boolean backup); - void setInitialConnectAttempts(int reconnectAttempts); - Topology getTopology(); } Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2010-11-26 11:28:20 UTC (rev 9931) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2010-11-26 12:38:11 UTC (rev 9932) @@ -486,6 +486,18 @@ checkWrite(); serverLocator.setReconnectAttempts(reconnectAttempts); } + + public synchronized void setInitialConnectAttempts(final int reconnectAttempts) + { + checkWrite(); + serverLocator.setInitialConnectAttempts(reconnectAttempts); + } + + public synchronized int getInitialConnectAttempts() + { + checkWrite(); + return serverLocator.getInitialConnectAttempts(); + } public synchronized boolean isFailoverOnInitialConnection() { Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-11-26 11:28:20 UTC (rev 9931) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-11-26 12:38:11 UTC (rev 9932) @@ -240,6 +240,7 @@ backupParams)); jbcfBackup.setBlockOnNonDurableSend(true); jbcfBackup.setBlockOnDurableSend(true); + jbcfBackup.setInitialConnectAttempts(-1); jbcfBackup.setReconnectAttempts(-1); Connection connLive = jbcfLive.createConnection();

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9931 - in branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration: client and 4 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-11-26 06:28:20 -0500 (Fri, 26 Nov 2010) New Revision: 9931 Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/String64KLimitTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java Log: make sure tests close all resources Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/String64KLimitTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -52,6 +52,7 @@ private HornetQServer server; private ClientSession session; + private ServerLocator locator; // Constructors -------------------------------------------------- @@ -206,7 +207,7 @@ config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName())); server = HornetQServers.newHornetQServer(config, false); server.start(); - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sf = locator.createSessionFactory(); session = sf.createSession(); } @@ -218,6 +219,8 @@ sf.close(); + locator.close(); + server.stop(); server = null; Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -85,8 +85,6 @@ server.stop(); server.start(); - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); - sf = locator.createSessionFactory(); session = sf.createSession(false, true, true); @@ -114,8 +112,6 @@ server.stop(); server.start(); - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); - sf = locator.createSessionFactory(); session = sf.createSession(false, true, true); Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -45,6 +45,7 @@ private ClientSession clientSession; private final SimpleString qName = new SimpleString("MessageGroupingTestQueue"); + private ServerLocator locator; public void testBasicGrouping() throws Exception { @@ -258,11 +259,13 @@ consumer = this.clientSession.createConsumer(qName); Assert.assertNull(consumer.receiveImmediate()); clientSession.close(); + locator.close(); } private void doTestMultipleGroupingTXRollback() throws Exception { - log.info("*** starting test");ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + log.info("*** starting test"); + ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); locator.setBlockOnAcknowledge(true); ClientSessionFactory sessionFactory = locator.createSessionFactory(); ClientSession clientSession = sessionFactory.createSession(false, false, false); @@ -333,6 +336,7 @@ consumer = this.clientSession.createConsumer(qName); Assert.assertNull(consumer.receiveImmediate()); clientSession.close(); + locator.close(); } private void dotestMultipleGroupingXACommit() throws Exception @@ -392,6 +396,7 @@ consumer = this.clientSession.createConsumer(qName); Assert.assertNull(consumer.receiveImmediate()); clientSession.close(); + locator.close(); } private void doTestMultipleGroupingXARollback() throws Exception @@ -472,6 +477,7 @@ consumer = this.clientSession.createConsumer(qName); Assert.assertNull(consumer.receiveImmediate()); clientSession.close(); + locator.close(); } private void doTestMultipleGrouping() throws Exception @@ -547,6 +553,7 @@ // } } + locator.close(); server = null; clientSession = null; @@ -567,7 +574,7 @@ server.start(); // then we create a client as normal - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSessionFactory sessionFactory = locator.createSessionFactory(); clientSession = sessionFactory.createSession(false, true, true); clientSession.createQueue(qName, qName, null, false); Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -375,6 +375,8 @@ }); session.close(); + + locator2.close(); } // Package protected --------------------------------------------- Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -173,6 +173,8 @@ session2.close(); + locator.close(); + server.stop(); } Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -31,6 +31,7 @@ private HornetQServer server; private ClientSession clientSession; + private ServerLocator locator; public void testBasicWildcardRouting() throws Exception { @@ -763,7 +764,7 @@ server.start(); server.getManagementService().enableNotifications(false); // then we create a client as normal - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSessionFactory sessionFactory = locator.createSessionFactory(); clientSession = sessionFactory.createSession(false, true, true); } @@ -795,7 +796,7 @@ } server = null; clientSession = null; - + locator.close(); super.tearDown(); } } Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -485,6 +485,12 @@ sf.close(); + locator3.close(); + + locator2.close(); + + locator.close(); + messagingService.stop(); } Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -87,6 +87,9 @@ session.close(); + locator.close(); + + server.stop(); } @@ -120,6 +123,8 @@ session.close(); + locator.close(); + server.stop(); } } Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -278,6 +278,8 @@ testSettersThrowException(cf); + cf.close(); + conn.close(); } @@ -647,6 +649,8 @@ cf.getRetryInterval(); cf.getRetryIntervalMultiplier(); cf.getReconnectAttempts(); + + cf.close(); } private void assertFactoryParams(final HornetQConnectionFactory cf, Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-11-26 10:55:02 UTC (rev 9930) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-11-26 11:28:20 UTC (rev 9931) @@ -50,6 +50,7 @@ private SimpleString expiryQueue; private SimpleString expiryAddress; + private ServerLocator locator; public void testBasicExpire() throws Exception { @@ -256,7 +257,7 @@ // start the server server.start(); // then we create a client as normal - ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); locator.setBlockOnAcknowledge(true); ClientSessionFactory sessionFactory = locator.createSessionFactory(); @@ -285,6 +286,7 @@ // } } + locator.close(); if (server != null && server.isStarted()) { try

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9930 - branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-11-26 05:55:02 -0500 (Fri, 26 Nov 2010) New Revision: 9930 Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java Log: fixed jms test Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-11-26 09:58:41 UTC (rev 9929) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-11-26 10:55:02 UTC (rev 9930) @@ -140,12 +140,15 @@ conf2.getConnectorConfigurations().put("toServer1", new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(0))); + conf2.getConnectorConfigurations().put("server2", + new TransportConfiguration(InVMConnectorFactory.class.getName(), + generateInVMParams(1))); conf2.setClustered(true); conf2.getClusterConfigurations().add(new ClusterConnectionConfiguration("to-server1", "jms", - "toServer1", + "server2", 1000, true, true, @@ -182,12 +185,15 @@ conf1.getConnectorConfigurations().put("toServer2", new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(1))); + conf1.getConnectorConfigurations().put("server1", + new TransportConfiguration(InVMConnectorFactory.class.getName(), + generateInVMParams(0))); conf1.setClustered(true); conf1.getClusterConfigurations().add(new ClusterConnectionConfiguration("to-server2", "jms", - "toServer2", + "server1", 1000, true, true,

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9929 - in branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover: server1 and 1 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-11-26 04:58:41 -0500 (Fri, 26 Nov 2010) New Revision: 9929 Modified: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-jms.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-jms.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-jms.xml Log: fixed example Modified: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-jms.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-jms.xml 2010-11-26 09:46:11 UTC (rev 9928) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-jms.xml 2010-11-26 09:58:41 UTC (rev 9929) @@ -28,7 +28,6 @@  <queue name="exampleQueue"> <entry name="/queue/exampleQueue"/> - <durable>true</durable> </queue> </configuration> Modified: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-jms.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-jms.xml 2010-11-26 09:46:11 UTC (rev 9928) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-jms.xml 2010-11-26 09:58:41 UTC (rev 9929) @@ -27,7 +27,6 @@  <queue name="exampleQueue"> <entry name="/queue/exampleQueue"/> - <durable>true</durable> </queue> </configuration> Modified: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-jms.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-jms.xml 2010-11-26 09:46:11 UTC (rev 9928) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-jms.xml 2010-11-26 09:58:41 UTC (rev 9929) @@ -27,7 +27,6 @@  <queue name="exampleQueue"> <entry name="/queue/exampleQueue"/> - <durable>true</durable> </queue> </configuration>

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9928 - in branches/2_2_0_HA_Improvements_preMerge: examples/common/src/org/hornetq/common/example and 11 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-11-26 04:46:11 -0500 (Fri, 26 Nov 2010) New Revision: 9928 Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.bat branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.sh branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/client-jndi.properties branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-beans.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-configuration.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-jms.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-users.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/client-jndi.properties branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-beans.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-configuration.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-jms.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-users.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/client-jndi.properties branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-beans.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-configuration.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-jms.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-users.xml branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/org/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/org/hornetq/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/org/hornetq/jms/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/org/hornetq/jms/example/ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/org/hornetq/jms/example/MultipleFailoverExample.java Modified: branches/2_2_0_HA_Improvements_preMerge/examples/common/build.xml branches/2_2_0_HA_Improvements_preMerge/examples/common/src/org/hornetq/common/example/HornetQExample.java branches/2_2_0_HA_Improvements_preMerge/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java branches/2_2_0_HA_Improvements_preMerge/examples/jms/hornetq-jms-examples.iml branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/impl/FileLockNodeManager.java Log: added multiple failover example Modified: branches/2_2_0_HA_Improvements_preMerge/examples/common/build.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/common/build.xml 2010-11-25 08:14:27 UTC (rev 9927) +++ branches/2_2_0_HA_Improvements_preMerge/examples/common/build.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -146,6 +146,7 @@ <jvmarg value="-Dhornetq.example.server.args=${server.args}"/> <jvmarg value="-Dhornetq.example.logserveroutput=${hornetq.example.logserveroutput}"/> <jvmarg value="-Dhornetq.example.runServer=${hornetq.example.runServer}"/> +  <arg line="${hornetq.example.beans.file}"/> <sysproperty key="java.library.path" value="${java.library.path}${path.separator}${aio.library.path}"/> <classpath refid="client.classpath"/> Modified: branches/2_2_0_HA_Improvements_preMerge/examples/common/src/org/hornetq/common/example/HornetQExample.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/common/src/org/hornetq/common/example/HornetQExample.java 2010-11-25 08:14:27 UTC (rev 9927) +++ branches/2_2_0_HA_Improvements_preMerge/examples/common/src/org/hornetq/common/example/HornetQExample.java 2010-11-26 09:46:11 UTC (rev 9928) @@ -141,6 +141,8 @@ { String config = configs[index]; HornetQExample.log.info("starting server with config '" + config + "' " + "logServerOutput " + logServerOutput); + String debugProp = System.getProperty("server" + index); + boolean debugServer= "true".equals(debugProp); servers[index] = SpawnedVMSupport.spawnVM(serverClasspath, "HornetQServer_" + index, SpawnedHornetQServer.class.getName(), @@ -149,6 +151,7 @@ "STARTED::", "FAILED::", config, + debugServer, "hornetq-beans.xml"); } Modified: branches/2_2_0_HA_Improvements_preMerge/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java 2010-11-25 08:14:27 UTC (rev 9927) +++ branches/2_2_0_HA_Improvements_preMerge/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java 2010-11-26 09:46:11 UTC (rev 9928) @@ -55,6 +55,7 @@ success, failure, configDir, + false, args); } @@ -66,6 +67,7 @@ final String success, final String failure, final String configDir, + boolean debug, final String... args) throws Exception { StringBuffer sb = new StringBuffer(); @@ -98,6 +100,10 @@ libPath = "\"" + libPath + "\""; } sb.append("-Djava.library.path=").append(libPath).append(" "); + if(debug) + { + sb.append("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 "); + } sb.append(className).append(' '); Modified: branches/2_2_0_HA_Improvements_preMerge/examples/jms/hornetq-jms-examples.iml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/hornetq-jms-examples.iml 2010-11-25 08:14:27 UTC (rev 9927) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/hornetq-jms-examples.iml 2010-11-26 09:46:11 UTC (rev 9928) @@ -68,6 +68,7 @@ <sourceFolder url="file://$MODULE_DIR$/send-acknowledgements/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/static-selector-jms/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/transaction-failover/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/multiple-failover/src" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/browser/build" /> <excludeFolder url="file://$MODULE_DIR$/browser/logs" /> <excludeFolder url="file://$MODULE_DIR$/browser/server0/build" /> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.bat =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.bat (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.bat 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,13 @@ +@echo off + +set "OVERRIDE_ANT_HOME=..\..\..\tools\ant" + +if exist "..\..\..\src\bin\build.bat" ( + rem running from TRUNK + call ..\..\..\src\bin\build.bat %* +) else ( + rem running from the distro + call ..\..\..\bin\build.bat %* +) + +set "OVERRIDE_ANT_HOME=" Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.sh =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.sh (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.sh 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,15 @@ +#!/bin/sh + +OVERRIDE_ANT_HOME=../../../tools/ant +export OVERRIDE_ANT_HOME + +if [ -f "../../../src/bin/build.sh" ]; then + # running from TRUNK + ../../../src/bin/build.sh "$@" +else + # running from the distro + ../../../bin/build.sh "$@" +fi + + + Property changes on: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.sh ___________________________________________________________________ Name: svn:executable + * Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/build.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent"> + ]> + +<project default="run" name="HornetQ JMS Non-transaction Multiple Failover Example"> + + <import file="../../common/build.xml"/> + + <target name="run" depends="delete-files"> + <antcall target="runExample"> + <param name="example.classname" value="org.hornetq.jms.example.MultipleFailoverExample"/> + <param name="hornetq.example.beans.file" value="server0 server1 server2"/> + </antcall> + </target> + + <target name="runRemote" depends="delete-files"> + <antcall target="runExample"> + <param name="example.classname" value="org.hornetq.jms.example.MultipleFailoverExample"/> + <param name="hornetq.example.runServer" value="false"/> + </antcall> + </target> + + <target name="delete-files" depends="clean"> + <delete file="./server0/KILL_ME"/> + <delete file="./server1/KILL_ME"/> + <delete file="./server2/KILL_ME"/> + </target> + +</project> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/client-jndi.properties =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/client-jndi.properties (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/client-jndi.properties 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.provider.url=jnp://localhost:1099 +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-beans.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-beans.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-beans.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/> + +  + <bean name="JNDIServer" class="org.jnp.server.Main"> + <property name="namingInfo"> + <inject bean="Naming"/> + </property> + <property name="port">1099</property> + <property name="bindAddress">localhost</property> + <property name="rmiPort">1098</property> + <property name="rmiBindAddress">localhost</property> + </bean> + +  + <bean name="MBeanServer" class="javax.management.MBeanServer"> + <constructor factoryClass="java.lang.management.ManagementFactory" + factoryMethod="getPlatformMBeanServer"/> + </bean> + +  + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/> + +  + <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + +  + <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> + <constructor> + <parameter> + <inject bean="Configuration"/> + </parameter> + <parameter> + <inject bean="MBeanServer"/> + </parameter> + <parameter> + <inject bean="HornetQSecurityManager"/> + </parameter> + </constructor> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + +  + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> + <constructor> + <parameter> + <inject bean="HornetQServer"/> + </parameter> + </constructor> + </bean> + +</deployment> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-configuration.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-configuration.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,63 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> + + <clustered>true</clustered> + + <shared-store>true</shared-store> +  + + <connectors> + <connector name="netty-connector"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="port" value="5445"/> + </connector> + </connectors> + +  + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="port" value="5445"/> + </acceptor> + </acceptors> + + <broadcast-groups> + <broadcast-group name="bg-group1"> + <group-address>231.7.7.7</group-address> + <group-port>9876</group-port> + <broadcast-period>5000</broadcast-period> + <connector-ref>netty-connector</connector-ref> + </broadcast-group> + </broadcast-groups> + + <discovery-groups> + <discovery-group name="dg-group1"> + <group-address>231.7.7.7</group-address> + <group-port>9876</group-port> + <refresh-timeout>60000</refresh-timeout> + </discovery-group> + </discovery-groups> + + <cluster-connections> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty-connector</connector-ref> + <discovery-group-ref discovery-group-name="dg-group1"/> + </cluster-connection> + </cluster-connections> +  + + <security-settings> +  + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + +</configuration> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-jms.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-jms.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-jms.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,34 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> +  + <connection-factory name="ConnectionFactory"> + <connectors> + <connector-ref connector-name="netty-connector"/> + </connectors> + + <entries> + <entry name="ConnectionFactory"/> + </entries> + + <ha>true</ha> +  + <retry-interval>1000</retry-interval> + +  + <retry-interval-multiplier>1.0</retry-interval-multiplier> + +  + <reconnect-attempts>-1</reconnect-attempts> + + </connection-factory> + +  + <queue name="exampleQueue"> + <entry name="/queue/exampleQueue"/> + <durable>true</durable> + </queue> + +</configuration> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-users.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-users.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server0/hornetq-users.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,7 @@ +<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd"> +  + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/client-jndi.properties =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/client-jndi.properties (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/client-jndi.properties 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,3 @@ +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.provider.url=jnp://localhost:2099 +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-beans.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-beans.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-beans.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/> + +  + <bean name="JNDIServer" class="org.jnp.server.Main"> + <property name="namingInfo"> + <inject bean="Naming"/> + </property> + <property name="port">2099</property> + <property name="bindAddress">localhost</property> + <property name="rmiPort">2098</property> + <property name="rmiBindAddress">localhost</property> + </bean> + +  + <bean name="MBeanServer" class="javax.management.MBeanServer"> + <constructor factoryClass="java.lang.management.ManagementFactory" + factoryMethod="getPlatformMBeanServer"/> + </bean> + +  + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/> + +  + <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + +  + <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> + <constructor> + <parameter> + <inject bean="Configuration"/> + </parameter> + <parameter> + <inject bean="MBeanServer"/> + </parameter> + <parameter> + <inject bean="HornetQSecurityManager"/> + </parameter> + </constructor> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + +  + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> + <constructor> + <parameter> + <inject bean="HornetQServer"/> + </parameter> + </constructor> + </bean> + +</deployment> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-configuration.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-configuration.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,71 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd"> + + <clustered>true</clustered> + + <backup>true</backup> + + <shared-store>true</shared-store> + +  + + <connectors> + <connector name="netty-connector"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="port" value="5446"/> + </connector> + </connectors> + +  + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="port" value="5446"/> + </acceptor> + </acceptors> + + <broadcast-groups> + <broadcast-group name="bg-group1"> + <group-address>231.7.7.7</group-address> + <group-port>9876</group-port> + <broadcast-period>5000</broadcast-period> + <connector-ref>netty-connector</connector-ref> + </broadcast-group> + </broadcast-groups> + + <discovery-groups> + <discovery-group name="dg-group1"> + <group-address>231.7.7.7</group-address> + <group-port>9876</group-port> + <refresh-timeout>60000</refresh-timeout> + </discovery-group> + </discovery-groups> + + <cluster-connections> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty-connector</connector-ref> + <discovery-group-ref discovery-group-name="dg-group1"/> + </cluster-connection> + </cluster-connections> +  + + <large-messages-directory>../server0/data/large-messages</large-messages-directory> + <bindings-directory>../server0/data/bindings</bindings-directory> + <journal-directory>../server0/data/journal</journal-directory> + <paging-directory>../server0/data/paging</paging-directory> + + <security-settings> +  + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + +</configuration> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-jms.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-jms.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-jms.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,33 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> +  + <connection-factory name="ConnectionFactory"> + <connectors> + <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/> + </connectors> + + <entries> + <entry name="ConnectionFactory"/> + </entries> + + <ha>true</ha> +  + <retry-interval>1000</retry-interval> + +  + <retry-interval-multiplier>1.0</retry-interval-multiplier> + +  + <reconnect-attempts>-1</reconnect-attempts> + </connection-factory> + +  + <queue name="exampleQueue"> + <entry name="/queue/exampleQueue"/> + <durable>true</durable> + </queue> + +</configuration> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-users.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-users.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server1/hornetq-users.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,7 @@ +<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd"> +  + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/client-jndi.properties =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/client-jndi.properties (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/client-jndi.properties 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,16 @@ +# +# Copyright 2009 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. +# + +java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory +java.naming.provider.url=jnp://localhost:3099 +java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-beans.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-beans.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-beans.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <bean name="Naming" class="org.jnp.server.NamingBeanImpl"/> + +  + <bean name="JNDIServer" class="org.jnp.server.Main"> + <property name="namingInfo"> + <inject bean="Naming"/> + </property> + <property name="port">3099</property> + <property name="bindAddress">localhost</property> + <property name="rmiPort">3098</property> + <property name="rmiBindAddress">localhost</property> + </bean> + +  + <bean name="MBeanServer" class="javax.management.MBeanServer"> + <constructor factoryClass="java.lang.management.ManagementFactory" + factoryMethod="getPlatformMBeanServer"/> + </bean> + +  + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/> + +  + <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + +  + <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> + <constructor> + <parameter> + <inject bean="Configuration"/> + </parameter> + <parameter> + <inject bean="MBeanServer"/> + </parameter> + <parameter> + <inject bean="HornetQSecurityManager"/> + </parameter> + </constructor> + <start ignored="true"/> + <stop ignored="true"/> + </bean> + +  + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> + <constructor> + <parameter> + <inject bean="HornetQServer"/> + </parameter> + </constructor> + </bean> + +</deployment> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-configuration.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-configuration.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-configuration.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,83 @@ + + +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq ../../../src/schema/hornetq-configuration.xsd"> +  + + <clustered>true</clustered> + + <backup>true</backup> + + <shared-store>true</shared-store> + + <connectors> + <connector name="netty-connector"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> + <param key="port" value="5447"/> + </connector> + </connectors> + +  + <acceptors> + <acceptor name="netty-acceptor"> + <factory-class>org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> + <param key="port" value="5447"/> + </acceptor> + </acceptors> + + <broadcast-groups> + <broadcast-group name="bg-group1"> + <group-address>231.7.7.7</group-address> + <group-port>9876</group-port> + <broadcast-period>5000</broadcast-period> + <connector-ref>netty-connector</connector-ref> + </broadcast-group> + </broadcast-groups> + + <discovery-groups> + <discovery-group name="dg-group1"> + <group-address>231.7.7.7</group-address> + <group-port>9876</group-port> + <refresh-timeout>60000</refresh-timeout> + </discovery-group> + </discovery-groups> + + <cluster-connections> + <cluster-connection name="my-cluster"> + <address>jms</address> + <connector-ref>netty-connector</connector-ref> + <discovery-group-ref discovery-group-name="dg-group1"/> + </cluster-connection> + </cluster-connections> + + <large-messages-directory>../server0/data/large-messages</large-messages-directory> + <bindings-directory>../server0/data/bindings</bindings-directory> + <journal-directory>../server0/data/journal</journal-directory> + <paging-directory>../server0/data/paging</paging-directory> +  + + <security-settings> +  + <security-setting match="jms.queue.exampleQueue"> + <permission type="createDurableQueue" roles="guest"/> + <permission type="deleteDurableQueue" roles="guest"/> + <permission type="createNonDurableQueue" roles="guest"/> + <permission type="deleteNonDurableQueue" roles="guest"/> + <permission type="consume" roles="guest"/> + <permission type="send" roles="guest"/> + </security-setting> + </security-settings> + +</configuration> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-jms.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-jms.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-jms.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,33 @@ +<configuration xmlns="urn:hornetq" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd"> +  + <connection-factory name="ConnectionFactory"> + <connectors> + <connector-ref connector-name="netty-connector" backup-connector-name="backup-connector"/> + </connectors> + + <entries> + <entry name="ConnectionFactory"/> + </entries> + + <ha>true</ha> +  + <retry-interval>1000</retry-interval> + +  + <retry-interval-multiplier>1.0</retry-interval-multiplier> + +  + <reconnect-attempts>-1</reconnect-attempts> + </connection-factory> + +  + <queue name="exampleQueue"> + <entry name="/queue/exampleQueue"/> + <durable>true</durable> + </queue> + +</configuration> Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-users.xml =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-users.xml (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/server2/hornetq-users.xml 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,7 @@ +<configuration xmlns="urn:hornetq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:hornetq /schema/hornetq-users.xsd"> +  + <defaultuser name="guest" password="guest"> + <role name="guest"/> + </defaultuser> +</configuration> \ No newline at end of file Added: branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/org/hornetq/jms/example/MultipleFailoverExample.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/org/hornetq/jms/example/MultipleFailoverExample.java (rev 0) +++ branches/2_2_0_HA_Improvements_preMerge/examples/jms/multiple-failover/src/org/hornetq/jms/example/MultipleFailoverExample.java 2010-11-26 09:46:11 UTC (rev 9928) @@ -0,0 +1,130 @@ +/* + * Copyright 2009 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.jms.example; + +import org.hornetq.common.example.HornetQExample; +import org.hornetq.jms.client.HornetQConnection; + +import javax.jms.*; +import javax.naming.InitialContext; + +/** + * @author <a href="mailto:andy.taylor@jboss.com">Andy Taylor</a> + * Date: Nov 4, 2010 + * Time: 10:51:45 AM + */ +public class MultipleFailoverExample extends HornetQExample +{ + public static void main(final String[] args) + { + new MultipleFailoverExample().run(args); + } + + @Override + public boolean runExample() throws Exception + { + Thread.sleep(10000); + final int numMessages = 30; + + Connection connection = null; + + InitialContext initialContext = null; + + try + { + // Step 1. Get an initial context for looking up JNDI from the server #1 + initialContext = getContext(0); + + // Step 2. Look up the JMS resources from JNDI + Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue"); + ConnectionFactory connectionFactory = (ConnectionFactory)initialContext.lookup("/ConnectionFactory"); + + // Step 3. Create a JMS Connection + connection = connectionFactory.createConnection(); + + // Step 4. Create a *non-transacted* JMS Session with client acknwoledgement + Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE); + + // Step 5. Start the connection to ensure delivery occurs + connection.start(); + + // Step 6. Create a JMS MessageProducer and a MessageConsumer + MessageProducer producer = session.createProducer(queue); + MessageConsumer consumer = session.createConsumer(queue); + + // Step 7. Send some messages to server #1, the live server + for (int i = 0; i < numMessages; i++) + { + TextMessage message = session.createTextMessage("This is text message " + i); + producer.send(message); + System.out.println("Sent message: " + message.getText()); + } + + // Step 8. Receive and acknowledge a third of the sent messages + TextMessage message0 = null; + for (int i = 0; i < numMessages / 3; i++) + { + message0 = (TextMessage)consumer.receive(5000); + System.out.println("Got message: " + message0.getText()); + } + message0.acknowledge(); + + // Step 9. Receive the rest third of the sent messages but *do not* acknowledge them yet + for (int i = numMessages / 3; i < numMessages; i++) + { + message0 = (TextMessage)consumer.receive(5000); + System.out.println("Got message: " + message0.getText()); + } + + // Step 10. Crash server #1, the live server, and wait a little while to make sure + // it has really crashed + killServer(0); + + // Step 11. Acknowledging the 2nd half of the sent messages will fail as failover to the + // backup server has occurred + try + { + message0.acknowledge(); + } + catch (JMSException e) + { + System.err.println("Got exception while acknowledging message: " + e.getMessage()); + } + + // Step 12. Consume again the 2nd half of the messages again. Note that they are not considered as redelivered. + for (int i = numMessages / 3; i < numMessages; i++) + { + message0 = (TextMessage)consumer.receive(5000); + System.out.printf("Got message: %s (redelivered?: %s)\n", message0.getText(), message0.getJMSRedelivered()); + } + message0.acknowledge(); + + return true; + } + finally + { + // Step 13. Be sure to close our resources! + + if (connection != null) + { + connection.close(); + } + + if (initialContext != null) + { + initialContext.close(); + } + } + } +} Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/impl/FileLockNodeManager.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/impl/FileLockNodeManager.java 2010-11-25 08:14:27 UTC (rev 9927) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/impl/FileLockNodeManager.java 2010-11-26 09:46:11 UTC (rev 9928) @@ -34,7 +34,7 @@ { private static final Logger log = Logger.getLogger(FileLockNodeManager.class); - private final String SERVER_LOCK_NAME = "server.lock"; + private static final String SERVER_LOCK_NAME = "server.lock"; private static final String ACCESS_MODE = "rw"; @@ -126,16 +126,16 @@ { do { - while (getState() == NOT_STARTED) + byte state = getState(); + while (state == NOT_STARTED || state == 0) { - log.info("awaiting live node startup"); + log.info("awaiting live node startup state='" + state + "'"); Thread.sleep(2000); + state = getState(); } liveLock = channel.lock(LIVE_LOCK_POS, 1, false); - - byte state = getState(); - + state = getState(); if (state == PAUSED) { liveLock.release(); @@ -162,7 +162,6 @@ log.info("Waiting to become backup node"); backupLock = channel.lock(BACKUP_LOCK_POS, LOCK_LENGTH, false); - log.info("** got backup lock"); readNodeId();

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9927 - branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-11-25 03:14:27 -0500 (Thu, 25 Nov 2010) New Revision: 9927 Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java Log: reversed last commit Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-11-25 05:37:49 UTC (rev 9926) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-11-25 08:14:27 UTC (rev 9927) @@ -442,7 +442,7 @@ managementService.getManagementAddress(), managementService.getManagementNotificationAddress(), record, - this.connector); + connector); record.setBridge(bridge);

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9926 - in branches/2_2_0_HA_Improvements_preMerge: tests/src/org/hornetq/tests/integration/cluster/distribution and 2 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-11-25 00:37:49 -0500 (Thu, 25 Nov 2010) New Revision: 9926 Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java Log: Fixing a test Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-11-24 04:25:38 UTC (rev 9925) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-11-25 05:37:49 UTC (rev 9926) @@ -442,7 +442,7 @@ managementService.getManagementAddress(), managementService.getManagementNotificationAddress(), record, - connector); + this.connector); record.setBridge(bridge); Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-11-24 04:25:38 UTC (rev 9925) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-11-25 05:37:49 UTC (rev 9926) @@ -27,10 +27,17 @@ import org.hornetq.api.core.Message; 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.core.client.impl.ServerLocatorImpl; -import org.hornetq.core.config.*; +import org.hornetq.api.core.client.ClientConsumer; +import org.hornetq.api.core.client.ClientMessage; +import org.hornetq.api.core.client.ClientProducer; +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.client.ServerLocator; +import org.hornetq.core.config.BroadcastGroupConfiguration; +import org.hornetq.core.config.ClusterConnectionConfiguration; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.DiscoveryGroupConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Binding; @@ -1262,80 +1269,9 @@ protected void setupServer(final int node, final boolean fileStorage, final boolean netty) { - setupLiveServer(node, fileStorage, true, netty); + setupLiveServer(node, fileStorage, false, netty); } - /*protected void setupServer(final int node, - final boolean fileStorage, - final boolean sharedStorage, - final boolean netty, - final boolean backup, - final int backupNode, - final boolean useFakeLock) - { - if (servers[node] != null) - { - throw new IllegalArgumentException("Already a server at node " + node); - } - - Configuration configuration = new ConfigurationImpl(); - - configuration.setSecurityEnabled(false); - configuration.setJournalMinFiles(2); - configuration.setJournalMaxIO_AIO(1000); - configuration.setJournalFileSize(100 * 1024); - configuration.setJournalType(getDefaultJournalType()); - configuration.setSharedStore(sharedStorage); - if (sharedStorage && backup) - { - // Shared storage will share the node between the backup and live node - int nodeDirectoryToUse = backupNode == -1 ? node : backupNode; - configuration.setBindingsDirectory(getBindingsDir(nodeDirectoryToUse, false)); - configuration.setJournalDirectory(getJournalDir(nodeDirectoryToUse, false)); - configuration.setPagingDirectory(getPageDir(nodeDirectoryToUse, false)); - configuration.setLargeMessagesDirectory(getLargeMessagesDir(nodeDirectoryToUse, false)); - } - else - { - configuration.setBindingsDirectory(getBindingsDir(node, backup)); - configuration.setJournalDirectory(getJournalDir(node, backup)); - configuration.setPagingDirectory(getPageDir(node, backup)); - configuration.setLargeMessagesDirectory(getLargeMessagesDir(node, backup)); - } - configuration.setClustered(true); - configuration.setJournalCompactMinFiles(0); - configuration.setBackup(backup); - - configuration.getAcceptorConfigurations().clear(); - configuration.getAcceptorConfigurations().add(createTransportConfiguration(netty, true, generateParams(node, netty))); - - HornetQServer server; - - if (fileStorage) - { - if (useFakeLock) - { - server = createFakeLockServer(true, configuration); - } - else - { - server = HornetQServers.newHornetQServer(configuration); - } - } - else - { - if (useFakeLock) - { - server = createFakeLockServer(false, configuration); - } - else - { - server = HornetQServers.newHornetQServer(configuration, false); - } - } - servers[node] = server; - }*/ - protected void setupLiveServer(final int node, final boolean fileStorage, final boolean sharedStorage, Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java 2010-11-24 04:25:38 UTC (rev 9925) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/jms/cluster/TemporaryQueueClusterTest.java 2010-11-25 05:37:49 UTC (rev 9926) @@ -14,14 +14,11 @@ package org.hornetq.tests.integration.jms.cluster; import javax.jms.Connection; -import javax.jms.DeliveryMode; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import javax.jms.TemporaryQueue; import javax.jms.TextMessage; -import javax.jms.Topic; import org.hornetq.tests.util.JMSClusteredTestBase; @@ -54,7 +51,56 @@ { super.setUp(); } + + + public void testClusteredQueue() throws Exception + { + System.out.println("Server1 = " + server1.getNodeID()); + System.out.println("Server2 = " + server2.getNodeID()); + jmsServer1.createQueue(false, "target", null, true, "/queue/target"); + jmsServer2.createQueue(false, "target", null, true, "/queue/target"); + + Connection conn1 = cf1.createConnection(); + Connection conn2 = cf2.createConnection(); + + conn1.start(); + + conn2.start(); + + try + { + Session session1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); + Queue targetQueue1 = session1.createQueue("target"); + + Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE); + Queue targetQueue2 = session2.createQueue("target"); + + // sleep a little bit to have the temp queue propagated to server #2 + Thread.sleep(3000); + MessageProducer prod1 = session1.createProducer(targetQueue1); + MessageConsumer cons2 = session2.createConsumer(targetQueue2); + + TextMessage msg = session1.createTextMessage("hello"); + + prod1.send(msg); + + prod1.send(msg); + + TextMessage msgReceived = (TextMessage)cons2.receive(5000); + + assertNotNull(msgReceived); + assertEquals(msgReceived.getText(), msg.getText()); + + } + finally + { + conn1.close(); + conn2.close(); + } + } + + public void testTemporaryQueue() throws Exception { jmsServer1.createQueue(false, "target", null, false, "/queue/target"); @@ -75,11 +121,11 @@ Session session2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE); Queue targetQueue2 = session2.createQueue("target"); - // sleep a little bit to have the temp queue propagated to server #2 - Thread.sleep(3000); MessageProducer prod1 = session1.createProducer(targetQueue1); MessageConsumer cons2 = session2.createConsumer(targetQueue2); MessageConsumer tempCons1 = session1.createConsumer(tempQueue); + // sleep a little bit to have the temp queue propagated to server #2 + Thread.sleep(3000); for (int i = 0; i < 10; i++) { Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-11-24 04:25:38 UTC (rev 9925) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-11-25 05:37:49 UTC (rev 9926) @@ -23,9 +23,7 @@ import javax.jms.Topic; import javax.naming.NamingException; -import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.ClusterConnectionConfiguration; import org.hornetq.core.config.Configuration; @@ -34,9 +32,8 @@ import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; -import org.hornetq.jms.client.HornetQJMSConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; -import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; import org.hornetq.jms.server.impl.JMSFactoryType; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; @@ -105,7 +102,7 @@ return (Topic)context1.lookup("/topic/" + name); } - + @Override protected void setUp() throws Exception { @@ -114,16 +111,16 @@ setupServer2(); setupServer1(); - jmsServer2.start(); - jmsServer2.activated(); - jmsServer1.start(); jmsServer1.activated(); - cf1 = (ConnectionFactory) HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), + jmsServer2.start(); + jmsServer2.activated(); + + cf1 = (ConnectionFactory) HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), + generateInVMParams(0))); + cf2 = (ConnectionFactory)HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), generateInVMParams(1))); - cf2 = (ConnectionFactory)HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(2))); } /** @@ -135,14 +132,14 @@ List<String> toOtherServerPair = new ArrayList<String>(); toOtherServerPair.add("toServer1"); - Configuration conf2 = createDefaultConfig(2, generateInVMParams(2), InVMAcceptorFactory.class.getCanonicalName()); + Configuration conf2 = createDefaultConfig(1, generateInVMParams(1), InVMAcceptorFactory.class.getCanonicalName()); conf2.setSecurityEnabled(false); conf2.setJMXManagementEnabled(true); conf2.setPersistenceEnabled(false); conf2.getConnectorConfigurations().put("toServer1", new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(1))); + generateInVMParams(0))); conf2.setClustered(true); @@ -176,7 +173,7 @@ List<String> toOtherServerPair = new ArrayList<String>(); toOtherServerPair.add("toServer2"); - Configuration conf1 = createDefaultConfig(1, generateInVMParams(1), InVMAcceptorFactory.class.getCanonicalName()); + Configuration conf1 = createDefaultConfig(0, generateInVMParams(0), InVMAcceptorFactory.class.getCanonicalName()); conf1.setSecurityEnabled(false); conf1.setJMXManagementEnabled(true); @@ -184,10 +181,8 @@ conf1.getConnectorConfigurations().put("toServer2", new TransportConfiguration(InVMConnectorFactory.class.getName(), - generateInVMParams(2))); + generateInVMParams(1))); - // TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY, params); - conf1.setClustered(true); conf1.getClusterConfigurations().add(new ClusterConnectionConfiguration("to-server2", @@ -226,6 +221,10 @@ { log.warn("Can't stop server2", e); } + + ((HornetQConnectionFactory)cf1).close(); + + ((HornetQConnectionFactory)cf2).close(); server2 = null;

13 years, 5 months

1
0
0 / 0

JBoss hornetq SVN: r9925 - in branches/2_2_0_HA_Improvements_preMerge: tests/src/org/hornetq/tests/integration/client and 1 other directory.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2010-11-23 23:25:38 -0500 (Tue, 23 Nov 2010) New Revision: 9925 Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/PagingTest.java Log: fixing pagingFailoverTest Modified: branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-11-24 03:36:30 UTC (rev 9924) +++ branches/2_2_0_HA_Improvements_preMerge/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-11-24 04:25:38 UTC (rev 9925) @@ -1107,6 +1107,9 @@ } } } + + // To recover positions on Iterators + pagingManager.processReload(); if (perfBlastPages != -1) { Modified: branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/PagingTest.java =================================================================== --- branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-11-24 03:36:30 UTC (rev 9924) +++ branches/2_2_0_HA_Improvements_preMerge/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-11-24 04:25:38 UTC (rev 9925) @@ -1700,6 +1700,135 @@ } + public void testParialConsume() throws Exception + { + clearData(); + + Configuration config = createDefaultConfig(); + + HornetQServer server = createServer(true, + config, + PagingTest.PAGE_SIZE, + PagingTest.PAGE_MAX, + new HashMap<String, AddressSettings>()); + + server.start(); + + final int numberOfMessages = 1000; + + try + { + + locator.setBlockOnNonDurableSend(true); + locator.setBlockOnDurableSend(true); + locator.setBlockOnAcknowledge(true); + + ClientSessionFactory sf = locator.createSessionFactory(); + ClientSession session = sf.createSession(null, null, false, false, false, false, 0); + + session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true); + + ClientProducer producer = session.createProducer(PagingTest.ADDRESS); + + ClientMessage message = null; + + for (int i = 0; i < numberOfMessages; i++) + { + message = session.createMessage(true); + + HornetQBuffer bodyLocal = message.getBodyBuffer(); + + bodyLocal.writeBytes(new byte[1024]); + + message.putIntProperty(new SimpleString("id"), i); + + producer.send(message); + } + + session.commit(); + + session.close(); + + locator.close(); + + server.stop(); + + server = createServer(true, + config, + PagingTest.PAGE_SIZE, + PagingTest.PAGE_MAX, + new HashMap<String, AddressSettings>()); + + server.start(); + + locator = createInVMNonHALocator(); + + sf = locator.createSessionFactory(); + + session = sf.createSession(null, null, false, false, false, false, 0); + + ClientConsumer consumer = session.createConsumer(PagingTest.ADDRESS); + + session.start(); + // 347 = I just picked any odd number, not rounded, to make sure it's not at the beggining of any page + for (int i = 0; i < 347; i++) + { + System.out.println("Received " + i); + ClientMessage msg = consumer.receive(5000); + assertEquals(i, msg.getIntProperty("id").intValue()); + Assert.assertNotNull(msg); + msg.acknowledge(); + session.commit(); + } + + session.close(); + + locator.close(); + + server.stop(); + + server = createServer(true, + config, + PagingTest.PAGE_SIZE, + PagingTest.PAGE_MAX, + new HashMap<String, AddressSettings>()); + + server.start(); + + locator = createInVMNonHALocator(); + + sf = locator.createSessionFactory(); + + session = sf.createSession(null, null, false, false, false, false, 0); + + consumer = session.createConsumer(PagingTest.ADDRESS); + + session.start(); + for (int i = 347; i < numberOfMessages; i++) + { + System.out.println("Received " + i); + ClientMessage msg = consumer.receive(5000); + assertEquals(i, msg.getIntProperty("id").intValue()); + Assert.assertNotNull(msg); + msg.acknowledge(); + session.commit(); + } + + session.close(); + } + finally + { + try + { + server.stop(); + } + catch (Throwable ignored) + { + } + } + + } + public void testPageMultipleDestinations() throws Exception { internalTestPageMultipleDestinations(false);

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits November 2010