JBoss hornetq SVN: r12136 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2012-02-17 10:03:28 -0500 (Fri, 17 Feb 2012)
New Revision: 12136
Modified:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java
Log:
removed unneeded method from FailBackManualTest
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java 2012-02-17 14:47:06 UTC (rev 12135)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java 2012-02-17 15:03:28 UTC (rev 12136)
@@ -89,7 +89,7 @@
t.start();
- waitForBackup(sf, 10);
+ waitForRemoteBackup(sf, 10, true, backupServer.getServer());
assertTrue(backupServer.isStarted());
@@ -106,31 +106,6 @@
Assert.assertEquals(0, sf.numConnections());
}
- protected void waitForBackup(ClientSessionFactoryInternal sf, int toWait)
- throws Exception
- {
- long time = System.currentTimeMillis();
- while (sf.getBackupConnector() == null)
- {
- try
- {
- Thread.sleep(100);
- }
- catch (InterruptedException e)
- {
- //ignore
- }
- if (sf.getBackupConnector() != null)
- {
- break;
- }
- else if (System.currentTimeMillis() > (time + toWait))
- {
- fail("backup server never started");
- }
- }
- System.out.println("sf.getBackupConnector() = " + sf.getBackupConnector());
- }
@Override
protected void createConfigs() throws Exception
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12135 - trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2012-02-17 09:47:06 -0500 (Fri, 17 Feb 2012)
New Revision: 12135
Modified:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java
Log:
fixed FailBackManualTest
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java 2012-02-17 13:44:48 UTC (rev 12134)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java 2012-02-17 14:47:06 UTC (rev 12135)
@@ -83,10 +83,6 @@
session.removeFailureListener(listener);
- listener = new CountDownSessionFailureListener(1);
-
- session.addFailureListener(listener);
-
liveConfig.setAllowAutoFailBack(false);
Thread t = new Thread(new ServerStarter(liveServer));
@@ -97,18 +93,12 @@
assertTrue(backupServer.isStarted());
- backupServer.stop();
+ backupServer.crash();
- assertTrue(listener.getLatch().await(15, TimeUnit.SECONDS));
+ waitForServer(liveServer.getServer());
- message = session.createMessage(true);
+ assertTrue(liveServer.isStarted());
- setBody(1, message);
-
- producer.send(message);
-
- session.close();
-
sf.close();
Assert.assertEquals(0, sf.numSessions());
@@ -116,6 +106,31 @@
Assert.assertEquals(0, sf.numConnections());
}
+ protected void waitForBackup(ClientSessionFactoryInternal sf, int toWait)
+ throws Exception
+ {
+ long time = System.currentTimeMillis();
+ while (sf.getBackupConnector() == null)
+ {
+ try
+ {
+ Thread.sleep(100);
+ }
+ catch (InterruptedException e)
+ {
+ //ignore
+ }
+ if (sf.getBackupConnector() != null)
+ {
+ break;
+ }
+ else if (System.currentTimeMillis() > (time + toWait))
+ {
+ fail("backup server never started");
+ }
+ }
+ System.out.println("sf.getBackupConnector() = " + sf.getBackupConnector());
+ }
@Override
protected void createConfigs() throws Exception
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12134 - in trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster: failover and 1 other directory.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2012-02-17 08:44:48 -0500 (Fri, 17 Feb 2012)
New Revision: 12134
Modified:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
Log:
test fix to allow backups to announce before starting test
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2012-02-17 12:39:49 UTC (rev 12133)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2012-02-17 13:44:48 UTC (rev 12134)
@@ -17,6 +17,7 @@
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -40,6 +41,8 @@
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.client.impl.Topology;
+import org.hornetq.core.client.impl.TopologyMember;
import org.hornetq.core.config.BroadcastGroupConfiguration;
import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.config.Configuration;
@@ -57,6 +60,7 @@
import org.hornetq.core.server.cluster.ClusterConnection;
import org.hornetq.core.server.cluster.ClusterManager;
import org.hornetq.core.server.cluster.RemoteQueueBinding;
+import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl;
import org.hornetq.core.server.group.GroupingHandler;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
import org.hornetq.core.server.impl.InVMNodeManager;
@@ -238,6 +242,64 @@
return consumers[node].consumer;
}
+
+ protected void waitForFailoverTopology(final int bNode, final int... nodes) throws Exception
+ {
+ HornetQServer server = servers[bNode];
+
+ log.debug("waiting for " + nodes + " on the topology for server = " + server);
+
+ long start = System.currentTimeMillis();
+
+ Set<ClusterConnection> ccs = server.getClusterManager().getClusterConnections();
+
+ if (ccs.size() != 1)
+ {
+ throw new IllegalStateException("You need a single cluster connection on this version of waitForTopology on ServiceTestBase");
+ }
+
+ boolean exists = false;
+
+ for (int node : nodes)
+ {
+ ClusterConnectionImpl clusterConnection = (ClusterConnectionImpl) ccs.iterator().next();
+ Topology topology = clusterConnection.getTopology();
+ TransportConfiguration nodeConnector=
+ servers[node].getClusterManager().getClusterConnections().iterator().next().getConnector();
+ do
+ {
+ Collection<TopologyMember> members = topology.getMembers();
+ for (TopologyMember member : members)
+ {
+ if(member.getConnector().getA() != null && member.getConnector().getA().equals(nodeConnector))
+ {
+ exists = true;
+ break;
+ }
+ }
+ if(exists)
+ {
+ break;
+ }
+ Thread.sleep(10);
+ }
+ while (System.currentTimeMillis() - start < WAIT_TIMEOUT);
+ if(!exists)
+ {
+ String msg = "Timed out waiting for cluster topology of " + nodes +
+ " (received " +
+ topology.getMembers().size() +
+ ") topology = " +
+ topology +
+ ")";
+
+ log.error(msg);
+
+ throw new Exception(msg);
+ }
+ }
+ }
+
protected void waitForMessages(final int node, final String address, final int count) throws Exception
{
HornetQServer server = servers[node];
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java 2012-02-17 12:39:49 UTC (rev 12133)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java 2012-02-17 13:44:48 UTC (rev 12134)
@@ -67,6 +67,10 @@
startServers(3, 4, 5, 0, 1, 2);
+ waitForFailoverTopology(3, 0, 1, 2);
+ waitForFailoverTopology(4, 0, 1, 2);
+ waitForFailoverTopology(5, 0, 1, 2);
+
setupSessionFactory(0, 3, isNetty(), false);
setupSessionFactory(1, 4, isNetty(), false);
setupSessionFactory(2, 5, isNetty(), false);
@@ -89,9 +93,12 @@
send(2, QUEUES_TESTADDRESS, 10, false, null);
verifyReceiveRoundRobinInSomeOrder(true, 10, 0, 1, 2);
-
+ Thread.sleep(1000);
failNode(0);
+ waitForFailoverTopology(4, 3, 1, 2);
+ waitForFailoverTopology(5, 3, 1, 2);
+
// live nodes
waitForBindings(1, QUEUES_TESTADDRESS, 1, 1, true);
waitForBindings(2, QUEUES_TESTADDRESS, 1, 1, true);
@@ -117,6 +124,9 @@
failNode(1);
+ waitForFailoverTopology(5, 3, 4, 2);
+
+ Thread.sleep(1000);
// live nodes
waitForBindings(2, QUEUES_TESTADDRESS, 1, 1, true);
// activated backup nodes
@@ -140,6 +150,7 @@
failNode(2);
+ Thread.sleep(1000);
// activated backup nodes
waitForBindings(3, QUEUES_TESTADDRESS, 1, 1, true);
waitForBindings(4, QUEUES_TESTADDRESS, 1, 1, true);
@@ -293,6 +304,10 @@
setupSessionFactory(1, 4, isNetty(), false);
setupSessionFactory(2, 5, isNetty(), false);
+ waitForFailoverTopology(3, 0, 1, 2);
+ waitForFailoverTopology(4, 0, 1, 2);
+ waitForFailoverTopology(5, 0, 1, 2);
+
createQueue(0, QUEUES_TESTADDRESS, QUEUE_NAME, null, true);
createQueue(1, QUEUES_TESTADDRESS, QUEUE_NAME, null, true);
createQueue(2, QUEUES_TESTADDRESS, QUEUE_NAME, null, true);
@@ -314,6 +329,8 @@
failNode(0);
+ waitForFailoverTopology(4, 3, 1, 2);
+ waitForFailoverTopology(5, 3, 1, 2);
// live nodes
waitForBindings(1, QUEUES_TESTADDRESS, 1, 1, true);
waitForBindings(2, QUEUES_TESTADDRESS, 1, 1, true);
@@ -356,6 +373,7 @@
failNode(1);
+ waitForFailoverTopology(5, 2, 4);
// live nodes
waitForBindings(2, QUEUES_TESTADDRESS, 1, 1, true);
// activated backup nodes
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12133 - trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2012-02-17 07:39:49 -0500 (Fri, 17 Feb 2012)
New Revision: 12133
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
HORNETQ-853 - small fix
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java 2012-02-17 10:27:16 UTC (rev 12132)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java 2012-02-17 12:39:49 UTC (rev 12133)
@@ -404,6 +404,8 @@
callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT;
+ callFailoverTimeout = HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT;
+
minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
consumerWindowSize = HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE;
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12132 - trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2012-02-17 05:27:16 -0500 (Fri, 17 Feb 2012)
New Revision: 12132
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
Log:
Guard getConnection() (public API!) from concurrent access.
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2012-02-17 10:26:56 UTC (rev 12131)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2012-02-17 10:27:16 UTC (rev 12132)
@@ -114,11 +114,12 @@
private final Object exitLock = new Object();
- private final Object createSessionLock = new Object();
private boolean inCreateSession;
+ private final Object createSessionLock = new Object();
private final Object failoverLock = new Object();
+ private final Object connectionLock = new Object();
private final ExecutorFactory orderedExecutorFactory;
@@ -1114,6 +1115,10 @@
public CoreRemotingConnection getConnection()
{
+ if (closed)
+ throw new IllegalStateException("ClientSessionFactory is closed!");
+ synchronized (connectionLock)
+ {
if (connection == null)
{
Connection tc = null;
@@ -1329,6 +1334,7 @@
}
return connection;
+ }
}
public void sendNodeAnnounce(final long currentEventID,
@@ -1680,9 +1686,6 @@
}
}
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12131 - trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2012-02-17 05:26:56 -0500 (Fri, 17 Feb 2012)
New Revision: 12131
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java
Log:
FIX race condition when shuting down SessionFactory.
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2012-02-17 10:26:56 UTC (rev 12131)
@@ -83,8 +83,6 @@
// Constants
// ------------------------------------------------------------------------------------
- private static final long serialVersionUID = 2512460695662741413L;
-
private static final Logger log = Logger.getLogger(ClientSessionFactoryImpl.class);
private static final boolean isTrace = ClientSessionFactoryImpl.log.isTraceEnabled();
@@ -145,7 +143,6 @@
private Connector connector;
private Future<?> pingerFuture;
-
private PingRunnable pingRunnable;
private volatile boolean exitLoop;
@@ -984,7 +981,7 @@
" multiplier = " +
retryIntervalMultiplier, new Exception("trace"));
}
-
+
long interval = retryInterval;
int count = 0;
@@ -1070,16 +1067,18 @@
private void cancelScheduledTasks()
{
- if (pingerFuture != null)
+ Future<?> pingerFutureLocal = pingerFuture;
+ if (pingerFutureLocal != null)
{
- pingRunnable.cancel();
-
- pingerFuture.cancel(false);
-
- pingRunnable = null;
-
- pingerFuture = null;
+ pingerFutureLocal.cancel(false);
}
+ PingRunnable pingRunnableLocal = pingRunnable;
+ if (pingRunnableLocal != null)
+ {
+ pingRunnableLocal.cancel();
+ }
+ pingerFuture = null;
+ pingRunnable = null;
}
private void checkCloseConnection()
@@ -1527,7 +1526,7 @@
}
}
}
-
+
public class CloseRunnable implements Runnable
{
private final CoreRemotingConnection conn;
@@ -1660,7 +1659,7 @@
}
/**
- *
+ *
*/
public void send()
{
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionImpl.java 2012-02-17 10:26:56 UTC (rev 12131)
@@ -84,7 +84,6 @@
import org.hornetq.core.remoting.FailureListener;
import org.hornetq.spi.core.protocol.RemotingConnection;
import org.hornetq.spi.core.remoting.Connection;
-import org.hornetq.spi.core.remoting.ConnectorFactory;
import org.hornetq.utils.ConcurrentHashSet;
import org.hornetq.utils.IDGenerator;
import org.hornetq.utils.SimpleIDGenerator;
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12130 - in trunk: hornetq-core/src/main/java/org/hornetq/core/client/impl and 19 other directories.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2012-02-17 04:38:02 -0500 (Fri, 17 Feb 2012)
New Revision: 12130
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/api/core/client/HornetQClient.java
trunk/hornetq-core/src/main/java/org/hornetq/api/core/client/ServerLocator.java
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/CoreRemotingConnection.java
trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/ChannelImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java
trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java
trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/ConnectionFactoryControl.java
trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/JMSServerControl.java
trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQConnectionFactory.java
trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java
trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/impl/JMSServerControlImpl.java
trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/JMSServerManager.java
trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java
trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java
trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/FloodServerTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TextMessageTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java
trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/CTSMiscellaneousTest.java
trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTestCase.java
trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/LocalTestServer.java
Log:
HORNETQ-853 - add callFailoverTimeout
Modified: trunk/hornetq-core/src/main/java/org/hornetq/api/core/client/HornetQClient.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/api/core/client/HornetQClient.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/main/java/org/hornetq/api/core/client/HornetQClient.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -62,6 +62,8 @@
public static final long DEFAULT_CALL_TIMEOUT = 30000;
+ public static final long DEFAULT_CALL_FAILOVER_TIMEOUT = -1;
+
public static final int DEFAULT_ACK_BATCH_SIZE = 1024 * 1024;
public static final boolean DEFAULT_PRE_ACKNOWLEDGE = false;
Modified: trunk/hornetq-core/src/main/java/org/hornetq/api/core/client/ServerLocator.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/api/core/client/ServerLocator.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/main/java/org/hornetq/api/core/client/ServerLocator.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -142,7 +142,26 @@
*/
void setCallTimeout(long callTimeout);
+
/**
+ * Returns the blocking calls failover timeout when the client is awaiting failover,
+ * this is over and above the normal call timeout.
+ * <p>
+ * If client is in the process of failing over when a blocking call is called then the client will wait this long before
+ * actually trying the send.
+ * @return the blocking calls failover timeout
+ */
+ long getCallFailoverTimeout();
+
+ /**
+ * Sets the blocking call failover timeout. when the client is awaiting failover,
+ * this is over and above the normal call timeout.
+ * <p>
+ * Value must be greater or equals to -1, -1 means forever
+ * @param callTimeout blocking call timeout in milliseconds
+ */
+ void setCallFailoverTimeout(long callFailoverTimeout);
+ /**
* Returns the large message size threshold.
* <p>
* Messages whose size is if greater than this value will be handled as <em>large messages</em>.
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -106,6 +106,8 @@
private final long callTimeout;
+ private final long callFailoverTimeout;
+
private final long clientFailureCheckPeriod;
private final long connectionTTL;
@@ -169,6 +171,7 @@
public ClientSessionFactoryImpl(final ServerLocatorInternal serverLocator,
final TransportConfiguration connectorConfig,
final long callTimeout,
+ final long callFailoverTimeout,
final long clientFailureCheckPeriod,
final long connectionTTL,
final long retryInterval,
@@ -192,6 +195,8 @@
this.callTimeout = callTimeout;
+ this.callFailoverTimeout = callFailoverTimeout;
+
this.clientFailureCheckPeriod = clientFailureCheckPeriod;
this.connectionTTL = connectionTTL;
@@ -1271,7 +1276,7 @@
return connection;
}
- connection = new RemotingConnectionImpl(tc, callTimeout, interceptors);
+ connection = new RemotingConnectionImpl(tc, callTimeout, callFailoverTimeout, interceptors);
connection.addFailureListener(new DelegatingFailureListener(connection.getID()));
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -121,6 +121,8 @@
private long callTimeout;
+ private long callFailoverTimeout;
+
private int minLargeMessageSize;
private int consumerWindowSize;
@@ -645,6 +647,7 @@
ClientSessionFactoryInternal factory = new ClientSessionFactoryImpl(this,
transportConfiguration,
callTimeout,
+ callFailoverTimeout,
clientFailureCheckPeriod,
connectionTTL,
retryInterval,
@@ -732,6 +735,7 @@
factory = new ClientSessionFactoryImpl(this,
tc,
callTimeout,
+ callFailoverTimeout,
clientFailureCheckPeriod,
connectionTTL,
retryInterval,
@@ -859,6 +863,17 @@
this.callTimeout = callTimeout;
}
+ public long getCallFailoverTimeout()
+ {
+ return callFailoverTimeout;
+ }
+
+ public void setCallFailoverTimeout(long callFailoverTimeout)
+ {
+ checkWrite();
+ this.callFailoverTimeout = callFailoverTimeout;
+ }
+
public int getMinLargeMessageSize()
{
return minLargeMessageSize;
@@ -1702,6 +1717,7 @@
ClientSessionFactoryInternal factory = new ClientSessionFactoryImpl(ServerLocatorImpl.this,
initialConnector,
callTimeout,
+ callFailoverTimeout,
clientFailureCheckPeriod,
connectionTTL,
retryInterval,
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/CoreRemotingConnection.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/CoreRemotingConnection.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/CoreRemotingConnection.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -91,6 +91,13 @@
long getBlockingCallTimeout();
/**
+ * Return the current timeout for blocking calls
+ *
+ * @return the timeout in milliseconds
+ */
+ long getBlockingCallFailoverTimeout();
+
+ /**
* return the transfer lock used when transferring connections.
*
* @return the lock
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/ChannelImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/ChannelImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/ChannelImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -219,7 +219,7 @@
try
{
- while (failingOver)
+ if (failingOver)
{
// TODO - don't hardcode this timeout
try
@@ -283,12 +283,18 @@
try
{
- while (failingOver)
+ if (failingOver)
{
- // TODO - don't hardcode this timeout
try
{
- failoverCondition.await(10000, TimeUnit.MILLISECONDS);
+ if(connection.getBlockingCallFailoverTimeout() < 0)
+ {
+ failoverCondition.await();
+ }
+ else
+ {
+ failoverCondition.await(connection.getBlockingCallFailoverTimeout(), TimeUnit.MILLISECONDS);
+ }
}
catch (InterruptedException e)
{
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/RemotingConnectionImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -68,6 +68,8 @@
private final long blockingCallTimeout;
+ private final long blockingCallFailoverTimeout;
+
private final List<Interceptor> interceptors;
private volatile boolean destroyed;
@@ -108,9 +110,10 @@
*/
public RemotingConnectionImpl(final Connection transportConnection,
final long blockingCallTimeout,
+ final long blockingCallFailoverTimeout,
final List<Interceptor> interceptors)
{
- this(transportConnection, blockingCallTimeout, interceptors, true, null, null);
+ this(transportConnection, blockingCallTimeout, blockingCallFailoverTimeout, interceptors, true, null, null);
}
/*
@@ -122,11 +125,12 @@
final SimpleString nodeID)
{
- this(transportConnection, -1, interceptors, false, executor, nodeID);
+ this(transportConnection, -1, -1, interceptors, false, executor, nodeID);
}
private RemotingConnectionImpl(final Connection transportConnection,
final long blockingCallTimeout,
+ final long blockingCallFailoverTimeout,
final List<Interceptor> interceptors,
final boolean client,
final Executor executor,
@@ -137,6 +141,8 @@
this.blockingCallTimeout = blockingCallTimeout;
+ this.blockingCallFailoverTimeout = blockingCallFailoverTimeout;
+
this.interceptors = interceptors;
this.client = client;
@@ -435,6 +441,12 @@
return blockingCallTimeout;
}
+ @Override
+ public long getBlockingCallFailoverTimeout()
+ {
+ return blockingCallFailoverTimeout;
+ }
+
public boolean checkDataReceived()
{
boolean res = dataReceived;
Modified: trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
===================================================================
--- trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2012-02-17 09:38:02 UTC (rev 12130)
@@ -370,6 +370,7 @@
<xsd:element maxOccurs="1" minOccurs="0" name="confirmation-window-size" type="xsd:int">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="call-timeout" type="xsd:long"/>
+ <xsd:element maxOccurs="1" minOccurs="0" name="call-failover-timeout" type="xsd:long"/>
<xsd:choice>
<xsd:element maxOccurs="1" minOccurs="0" name="static-connectors">
<xsd:complexType>
Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -1561,6 +1561,7 @@
locators.add(locator);
}
}
+ // locator.setCallFailoverTimeout(5000);
return locator;
}
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/ConnectionFactoryControl.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/ConnectionFactoryControl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/ConnectionFactoryControl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -88,6 +88,15 @@
void setCallTimeout(long callTimeout);
/**
+ * @see ServerLocator#getCallFailoverTimeout()
+ */
+ long getCallFailoverTimeout();
+ /**
+ * @see ServerLocator#setCallFailoverTimeout(long)
+ */
+
+ void setCallFailoverTimeout(long callTimeout);
+ /**
* Returns the batch size (in bytes) between acknowledgements when using DUPS_OK_ACKNOWLEDGE
* mode.
* @see ServerLocator#getAckBatchSize()
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/JMSServerControl.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/JMSServerControl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/api/jms/management/JMSServerControl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -138,8 +138,7 @@
* {@code liveConnectorsTransportClassNames} are the class names
* of the {@link ConnectorFactory} to connect to the live servers
* and {@code liveConnectorTransportParams} are Map<String, Object> for the corresponding {@link TransportConfiguration}'s parameters.
- *
- * @see ClientSessionFactory#setStaticConnectors(java.util.List)
+ *
*/
void createConnectionFactory(String name,
boolean ha,
@@ -173,6 +172,7 @@
@Parameter(name = "clientFailureCheckPeriod", desc = "clientFailureCheckPeriod") long clientFailureCheckPeriod,
@Parameter(name = "connectionTTL", desc = "connectionTTL") long connectionTTL,
@Parameter(name = "callTimeout", desc = "callTimeout") long callTimeout,
+ @Parameter(name = "callFailoverTimeout", desc = "callFailoverTimeout") long callFailoverTimeout,
@Parameter(name = "minLargeMessageSize", desc = "minLargeMessageSize") int minLargeMessageSize,
@Parameter(name = "compressLargeMessages", desc = "compressLargeMessages") boolean compressLargeMessages,
@Parameter(name = "consumerWindowSize", desc = "consumerWindowSize") int consumerWindowSize,
@@ -210,6 +210,7 @@
@Parameter(name = "clientFailureCheckPeriod", desc = "clientFailureCheckPeriod") long clientFailureCheckPeriod,
@Parameter(name = "connectionTTL", desc = "connectionTTL") long connectionTTL,
@Parameter(name = "callTimeout", desc = "callTimeout") long callTimeout,
+ @Parameter(name = "callFailoverTimeout", desc = "callFailoverTimeout") long callFailoverTimeout,
@Parameter(name = "minLargeMessageSize", desc = "minLargeMessageSize") int minLargeMessageSize,
@Parameter(name = "compressLargeMessages", desc = "compressLargeMessages") boolean compressLargeMessages,
@Parameter(name = "consumerWindowSize", desc = "consumerWindowSize") int consumerWindowSize,
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQConnectionFactory.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQConnectionFactory.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/client/HornetQConnectionFactory.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -272,6 +272,17 @@
serverLocator.setCallTimeout(callTimeout);
}
+ public synchronized long getCallFailoverTimeout()
+ {
+ return serverLocator.getCallFailoverTimeout();
+ }
+
+ public synchronized void setCallFailoverTimeout(final long callTimeout)
+ {
+ checkWrite();
+ serverLocator.setCallFailoverTimeout(callTimeout);
+ }
+
public synchronized int getConsumerWindowSize()
{
return serverLocator.getConsumerWindowSize();
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -138,6 +138,12 @@
recreateCF();
}
+ public void setCallFailoverTimeout(long callTimeout)
+ {
+ cfConfig.setCallFailoverTimeout(callTimeout);
+ recreateCF();
+ }
+
public void setConsumerWindowSize(int consumerWindowSize)
{
cfConfig.setConsumerWindowSize(consumerWindowSize);
@@ -335,6 +341,11 @@
return cfConfig.getCallTimeout();
}
+ public long getCallFailoverTimeout()
+ {
+ return cfConfig.getCallFailoverTimeout();
+ }
+
public int getConsumerMaxRate()
{
return cfConfig.getConsumerMaxRate();
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -224,6 +224,7 @@
long clientFailureCheckPeriod,
long connectionTTL,
long callTimeout,
+ long callFailoverTimeout,
int minLargeMessageSize,
boolean compressLargeMessages,
int consumerWindowSize,
@@ -259,6 +260,7 @@
clientFailureCheckPeriod,
connectionTTL,
callTimeout,
+ callFailoverTimeout,
minLargeMessageSize,
compressLargeMessages,
consumerWindowSize,
@@ -298,6 +300,7 @@
long clientFailureCheckPeriod,
long connectionTTL,
long callTimeout,
+ long callFailoverTimeout,
int minLargeMessageSize,
boolean compressLargeMessages,
int consumerWindowSize,
@@ -350,6 +353,7 @@
configuration.setClientFailureCheckPeriod(clientFailureCheckPeriod);
configuration.setConnectionTTL(connectionTTL);
configuration.setCallTimeout(callTimeout);
+ configuration.setCallFailoverTimeout(callFailoverTimeout);
configuration.setMinLargeMessageSize(minLargeMessageSize);
configuration.setCompressLargeMessages(compressLargeMessages);
configuration.setConsumerWindowSize(consumerWindowSize);
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/JMSServerManager.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/JMSServerManager.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/JMSServerManager.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -70,8 +70,8 @@
*
* @param topicName
* the name of the topic
- * @param binding
- * the name of the binding for JNDI or BindingRegistry
+ * @param bindings
+ * the names of the binding for JNDI or BindingRegistry
* @return true if the topic was created or if it existed and was added to
* JNDI
* @throws Exception
@@ -179,6 +179,7 @@
long clientFailureCheckPeriod,
long connectionTTL,
long callTimeout,
+ long callFailoverTimeout,
boolean cacheLargeMessagesClient,
int minLargeMessageSize,
boolean compressLargeMessage,
@@ -214,6 +215,7 @@
long clientFailureCheckPeriod,
long connectionTTL,
long callTimeout,
+ long callFailoverTimeout,
boolean cacheLargeMessagesClient,
int minLargeMessageSize,
boolean compressLargeMessages,
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -64,6 +64,10 @@
void setCallTimeout(long callTimeout);
+ long getCallFailoverTimeout();
+
+ void setCallFailoverTimeout(long callFailoverTimeout);
+
boolean isCacheLargeMessagesClient();
void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient);
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -61,6 +61,8 @@
private long callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT;
+ private long callFailoverTimeout = HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT;
+
private boolean cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT;
private int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
@@ -239,6 +241,16 @@
this.callTimeout = callTimeout;
}
+ public long getCallFailoverTimeout()
+ {
+ return callFailoverTimeout;
+ }
+
+ public void setCallFailoverTimeout(long callFailoverTimeout)
+ {
+ this.callFailoverTimeout = callFailoverTimeout;
+ }
+
public boolean isCacheLargeMessagesClient()
{
return cacheLargeMessagesClient;
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/impl/JMSServerConfigParserImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -260,6 +260,10 @@
"call-timeout",
HornetQClient.DEFAULT_CALL_TIMEOUT,
Validators.GE_ZERO);
+ long callFailoverTimeout = XMLConfigurationUtil.getLong(e,
+ "call-failover-timeout",
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
+ Validators.MINUS_ONE_OR_GT_ZERO);
String clientID = XMLConfigurationUtil.getString(e, "client-id", null, Validators.NO_CHECK);
int dupsOKBatchSize = XMLConfigurationUtil.getInteger(e,
"dups-ok-batch-size",
@@ -423,6 +427,7 @@
cfConfig.setClientFailureCheckPeriod(clientFailureCheckPeriod);
cfConfig.setConnectionTTL(connectionTTL);
cfConfig.setCallTimeout(callTimeout);
+ cfConfig.setCallFailoverTimeout(callFailoverTimeout);
cfConfig.setCacheLargeMessagesClient(cacheLargeMessagesClient);
cfConfig.setMinLargeMessageSize(minLargeMessageSize);
cfConfig.setCompressLargeMessages(compressLargeMessages);
Modified: trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/hornetq-jms/src/main/java/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -839,6 +839,7 @@
final long clientFailureCheckPeriod,
final long connectionTTL,
final long callTimeout,
+ final long callFailoverTimeout,
final boolean cacheLargeMessagesClient,
final int minLargeMessageSize,
final boolean compressLargeMessage,
@@ -876,6 +877,7 @@
configuration.setConnectionTTL(connectionTTL);
configuration.setFactoryType(cfType);
configuration.setCallTimeout(callTimeout);
+ configuration.setCallFailoverTimeout(callFailoverTimeout);
configuration.setCacheLargeMessagesClient(cacheLargeMessagesClient);
configuration.setMinLargeMessageSize(minLargeMessageSize);
configuration.setCompressLargeMessages(compressLargeMessage);
@@ -913,6 +915,7 @@
final long clientFailureCheckPeriod,
final long connectionTTL,
final long callTimeout,
+ final long callFailoverTimeout,
final boolean cacheLargeMessagesClient,
final int minLargeMessageSize,
final boolean compressLargeMessages,
@@ -951,6 +954,7 @@
configuration.setClientFailureCheckPeriod(clientFailureCheckPeriod);
configuration.setConnectionTTL(connectionTTL);
configuration.setCallTimeout(callTimeout);
+ configuration.setCallFailoverTimeout(callFailoverTimeout);
configuration.setCacheLargeMessagesClient(cacheLargeMessagesClient);
configuration.setMinLargeMessageSize(minLargeMessageSize);
configuration.setCompressLargeMessages(compressLargeMessages);
@@ -1248,6 +1252,7 @@
cf.setClientFailureCheckPeriod(cfConfig.getClientFailureCheckPeriod());
cf.setConnectionTTL(cfConfig.getConnectionTTL());
cf.setCallTimeout(cfConfig.getCallTimeout());
+ cf.setCallFailoverTimeout(cfConfig.getCallFailoverTimeout());
cf.setCacheLargeMessagesClient(cfConfig.isCacheLargeMessagesClient());
cf.setMinLargeMessageSize(cfConfig.getMinLargeMessageSize());
cf.setConsumerWindowSize(cfConfig.getConsumerWindowSize());
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/ReplicatedPagedFailoverTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -20,6 +20,12 @@
@Override
public void testFailWithBrowser() throws Exception
{
- // paged messages are not available for browsing
+ int i = 0;
+ while(true)
+ {
+ testCreateNewFactoryAfterFailover();
+ tearDown();
+ setUp();
+ }
}
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/FloodServerTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/FloodServerTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/FloodServerTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -134,6 +134,7 @@
1000,
HornetQClient.DEFAULT_CONNECTION_TTL,
callTimeout,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -179,6 +179,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
callTimeout,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/ReSendMessageTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -276,6 +276,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
callTimeout,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
true,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -72,6 +72,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
HornetQClient.DEFAULT_CALL_TIMEOUT,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TextMessageTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -209,6 +209,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
callTimeout,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
true,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -152,6 +152,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
callTimeout,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -490,6 +490,7 @@
1, // clientFailureCheckPeriod
1, // connectionTTL
1, // callTimeout
+ 1, //callFailoverTimeout
1, // minLargeMessageSize
true, // compressLargeMessages
1, // consumerWindowSize
@@ -523,6 +524,7 @@
assertEquals(1, cf.getClientFailureCheckPeriod());
assertEquals(1, cf.getConnectionTTL());
assertEquals(1, cf.getCallTimeout());
+ assertEquals(1, cf.getCallFailoverTimeout());
assertEquals(1, cf.getMinLargeMessageSize());
assertEquals(true, cf.isCompressLargeMessage());
assertEquals(1, cf.getConsumerWindowSize());
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -73,6 +73,7 @@
1, // clientFailureCheckPeriod
1, // connectionTTL
1, // callTimeout
+ 1, // callFailoverTimeout
1, // minLargeMessageSize
true, // compressLargeMessages
1, // consumerWindowSize
@@ -106,6 +107,7 @@
assertEquals(1, cf.getClientFailureCheckPeriod());
assertEquals(1, cf.getConnectionTTL());
assertEquals(1, cf.getCallTimeout());
+ assertEquals(1, cf.getCallFailoverTimeout());
assertEquals(1, cf.getMinLargeMessageSize());
assertEquals(true, cf.isCompressLargeMessage());
assertEquals(1, cf.getConsumerWindowSize());
@@ -360,6 +362,7 @@
long clientFailureCheckPeriod,
long connectionTTL,
long callTimeout,
+ long callFailoverTimeout,
int minLargeMessageSize,
boolean compressLargeMessages,
int consumerWindowSize,
@@ -396,6 +399,7 @@
clientFailureCheckPeriod,
connectionTTL,
callTimeout,
+ callFailoverTimeout,
minLargeMessageSize,
compressLargeMessages,
consumerWindowSize,
@@ -432,6 +436,7 @@
long clientFailureCheckPeriod,
long connectionTTL,
long callTimeout,
+ long callFailoverTimeout,
int minLargeMessageSize,
boolean compressLargeMessages,
int consumerWindowSize,
@@ -468,6 +473,7 @@
clientFailureCheckPeriod,
connectionTTL,
callTimeout,
+ callFailoverTimeout,
minLargeMessageSize,
compressLargeMessages,
consumerWindowSize,
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/util/JMSTestBase.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -225,6 +225,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
callTimeout,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/CTSMiscellaneousTest.java
===================================================================
--- trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -66,6 +66,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
HornetQClient.DEFAULT_CALL_TIMEOUT,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTestCase.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/JMSTestCase.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -74,6 +74,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
HornetQClient.DEFAULT_CALL_TIMEOUT,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
@@ -109,6 +110,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
HornetQClient.DEFAULT_CALL_TIMEOUT,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
@@ -144,6 +146,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
HornetQClient.DEFAULT_CALL_TIMEOUT,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
Modified: trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/LocalTestServer.java
===================================================================
--- trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2012-02-16 15:17:59 UTC (rev 12129)
+++ trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2012-02-17 09:38:02 UTC (rev 12130)
@@ -301,6 +301,7 @@
HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
HornetQClient.DEFAULT_CONNECTION_TTL,
HornetQClient.DEFAULT_CALL_TIMEOUT,
+ HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT,
HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT,
HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
HornetQClient.DEFAULT_COMPRESS_LARGE_MESSAGES,
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12129 - in trunk/hornetq-core/src: test/java/org/hornetq/core/config/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2012-02-16 10:17:59 -0500 (Thu, 16 Feb 2012)
New Revision: 12129
Modified:
trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
trunk/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java
trunk/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml
Log:
HORNETQ-855 Fix configuration file tests by adding the following options:
- page-max-concurrent-io
- bridge.min-large-message-size
- clusterConf.min-large-message-size
Modified: trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd
===================================================================
--- trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2012-02-16 14:07:03 UTC (rev 12128)
+++ trunk/hornetq-core/src/main/resources/schema/hornetq-configuration.xsd 2012-02-16 15:17:59 UTC (rev 12129)
@@ -7,8 +7,8 @@
<xsd:element maxOccurs="1" minOccurs="0" name="name" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" ref="clustered"/>
- <xsd:element maxOccurs="1" minOccurs="0" ref="file-deployment-enabled"/>
- <xsd:element maxOccurs="1" minOccurs="0" ref="persistence-enabled"/>
+ <xsd:element maxOccurs="1" minOccurs="0" ref="file-deployment-enabled"/>
+ <xsd:element maxOccurs="1" minOccurs="0" ref="persistence-enabled"/>
<xsd:element maxOccurs="1" minOccurs="0" name="scheduled-thread-pool-max-size" type="xsd:int">
<xsd:annotation>
<xsd:documentation>
@@ -34,9 +34,9 @@
<xsd:element maxOccurs="1" minOccurs="0" name="management-notification-address" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="cluster-user" type="xsd:string">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="cluster-password" type="xsd:string">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="log-delegate-factory-class-name" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="jmx-management-enabled" type="xsd:boolean">
@@ -52,7 +52,7 @@
<xsd:element maxOccurs="1" minOccurs="0" name="connection-ttl-override" type="xsd:long">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="async-connection-execution-enabled" type="xsd:boolean">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="transaction-timeout" type="xsd:long">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="transaction-timeout-scan-period" type="xsd:long">
@@ -76,11 +76,11 @@
<xsd:element maxOccurs="1" minOccurs="0" name="failover-on-shutdown" type="xsd:boolean">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="shared-store" type="xsd:boolean">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="persist-delivery-count-before-delivery" type="xsd:boolean">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="live-connector-ref" type="live-connectorType">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="connectors">
<xsd:complexType>
<xsd:sequence>
@@ -146,16 +146,18 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="create-bindings-dir" type="xsd:boolean">
</xsd:element>
+ <xsd:element maxOccurs="1" minOccurs="0" name="page-max-concurrent-io" type="xsd:int">
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="journal-directory" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="create-journal-dir" type="xsd:boolean">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="journal-type" type="journalType">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="journal-buffer-timeout" type="xsd:long">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="journal-buffer-size" type="xsd:long">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="journal-sync-transactional" type="xsd:boolean">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="journal-sync-non-transactional" type="xsd:boolean">
@@ -181,7 +183,7 @@
<xsd:element maxOccurs="1" minOccurs="0" name="memory-warning-threshold" type="xsd:int">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="memory-measure-interval" type="xsd:long">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="large-messages-directory" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="security-settings">
@@ -200,9 +202,9 @@
</xsd:element>
<xsd:element name="clustered" type="xsd:boolean"/>
-
+
<xsd:element name="file-deployment-enabled" type="xsd:boolean"/>
-
+
<xsd:element name="persistence-enabled" type="xsd:boolean"/>
<xsd:element name="local-bind-address" type="xsd:string"/>
@@ -298,7 +300,7 @@
<xsd:attribute name="name" type="xsd:string" use="optional"/>
</xsd:complexType>
- <xsd:complexType name="bridgeType">
+ <xsd:complexType name="bridgeType">
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1" name="queue-name" type="xsd:IDREF">
</xsd:element>
@@ -313,6 +315,8 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="transformer-class-name" type="xsd:string">
</xsd:element>
+ <xsd:element maxOccurs="1" minOccurs="0" name="min-large-message-size" type="xsd:int">
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="retry-interval-multiplier" type="xsd:double">
@@ -329,14 +333,14 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="password" type="xsd:string">
</xsd:element>
- <xsd:choice>
+ <xsd:choice>
<xsd:element maxOccurs="1" minOccurs="1" name="static-connectors">
<xsd:complexType>
<xsd:sequence>
<xsd:element maxOccurs="unbounded" minOccurs="1" name="connector-ref" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="1" name="discovery-group-ref">
<xsd:complexType>
<xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required">
@@ -344,18 +348,19 @@
</xsd:complexType>
</xsd:element>
</xsd:choice>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
-
- <xsd:complexType name="clusterConnectionType">
+
+ <xsd:complexType name="clusterConnectionType">
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="1" name="connector-ref" type="xsd:string">
</xsd:element>
+ <xsd:element maxOccurs="1" minOccurs="0" name="min-large-message-size" type="xsd:int"/>
<xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="use-duplicate-detection" type="xsd:boolean">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="forward-when-no-consumers" type="xsd:boolean">
@@ -373,7 +378,7 @@
</xsd:sequence>
<xsd:attribute name="allow-direct-connections-only" type="xsd:boolean" use="optional"/>
</xsd:complexType>
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="discovery-group-ref">
<xsd:complexType>
<xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required">
@@ -385,7 +390,7 @@
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
- <xsd:complexType name="divertType">
+ <xsd:complexType name="divertType">
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="0" name="routing-name" type="xsd:string">
</xsd:element>
@@ -402,8 +407,8 @@
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="exclusive" type="xsd:boolean">
</xsd:element>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>
<xsd:simpleType name="journalType">
@@ -460,7 +465,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="address-setting">
<xsd:complexType>
<xsd:all>
@@ -479,7 +484,7 @@
<xsd:element maxOccurs="1" minOccurs="0" name="page-max-cache-size" type="xsd:int">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="address-full-policy" type="addressFullMessagePolicyType">
- </xsd:element>
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="message-counter-history-day-limit" type="xsd:int">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="last-value-queue" type="xsd:boolean">
@@ -490,9 +495,9 @@
</xsd:element>
</xsd:all>
<xsd:attribute name="match" type="xsd:string" use="required"/>
- </xsd:complexType>
+ </xsd:complexType>
</xsd:element>
-
+
<xsd:element name="queues">
<xsd:complexType>
<xsd:sequence>
@@ -501,7 +506,7 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
-
+
<xsd:element name="queue">
<xsd:complexType>
<xsd:all>
@@ -518,12 +523,12 @@
<xsd:attribute name="name" type="xsd:ID" use="required"/>
</xsd:complexType>
</xsd:element>
-
+
<xsd:complexType name="live-connectorType">
<xsd:attribute name="connector-name" type="xsd:IDREF" use="required">
</xsd:attribute>
</xsd:complexType>
-
+
<xsd:simpleType name="addressFullMessagePolicyType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="DROP"/>
@@ -531,7 +536,7 @@
<xsd:enumeration value="BLOCK"/>
</xsd:restriction>
</xsd:simpleType>
-
+
<xsd:complexType name="connectorServiceType">
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1" name="factory-class" type="xsd:string">
Modified: trunk/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java
===================================================================
--- trunk/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java 2012-02-16 14:07:03 UTC (rev 12128)
+++ trunk/hornetq-core/src/test/java/org/hornetq/core/config/impl/FileConfigurationTest.java 2012-02-16 15:17:59 UTC (rev 12129)
@@ -23,7 +23,6 @@
import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.DivertConfiguration;
-import org.hornetq.core.config.impl.FileConfiguration;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.JournalType;
@@ -70,8 +69,8 @@
Assert.assertEquals("pagingdir", conf.getPagingDirectory());
Assert.assertEquals("somedir", conf.getBindingsDirectory());
Assert.assertEquals(false, conf.isCreateBindingsDir());
-
- Assert.assertEquals(17, conf.getPageMaxConcurrentIO());
+
+ Assert.assertEquals("max concurrent io", 17, conf.getPageMaxConcurrentIO());
Assert.assertEquals("somedir2", conf.getJournalDirectory());
Assert.assertEquals(false, conf.isCreateJournalDir());
Assert.assertEquals(JournalType.NIO, conf.getJournalType());
@@ -201,7 +200,7 @@
{
Assert.assertEquals("bridge1", bc.getName());
Assert.assertEquals("queue1", bc.getQueueName());
- Assert.assertEquals(4, bc.getMinLargeMessageSize());
+ Assert.assertEquals("minLargeMessageSize", 4, bc.getMinLargeMessageSize());
Assert.assertEquals("bridge-forwarding-address1", bc.getForwardingAddress());
Assert.assertEquals("sku > 1", bc.getFilterString());
Assert.assertEquals("org.foo.BridgeTransformer", bc.getTransformerClassName());
@@ -230,7 +229,7 @@
if (ccc.getName().equals("cluster-connection1"))
{
Assert.assertEquals("cluster-connection1", ccc.getName());
- Assert.assertEquals(321, ccc.getMinLargeMessageSize());
+ Assert.assertEquals("clusterConnectionConf minLargeMessageSize", 321, ccc.getMinLargeMessageSize());
Assert.assertEquals("queues1", ccc.getAddress());
Assert.assertEquals(3, ccc.getRetryInterval());
Assert.assertEquals(true, ccc.isDuplicateDetection());
@@ -254,13 +253,13 @@
Assert.assertEquals("dg1", ccc.getDiscoveryGroupName());
}
}
-
-
+
+
assertEquals(2, conf.getAddressesSettings().size());
-
+
assertTrue(conf.getAddressesSettings().get("a1") != null);
assertTrue(conf.getAddressesSettings().get("a2") != null);
-
+
assertEquals("a1.1", conf.getAddressesSettings().get("a1").getDeadLetterAddress().toString());
assertEquals("a1.2", conf.getAddressesSettings().get("a1").getExpiryAddress().toString());
assertEquals(1, conf.getAddressesSettings().get("a1").getRedeliveryDelay());
@@ -276,28 +275,28 @@
assertEquals(7126716262626l, conf.getAddressesSettings().get("a2").getPageSizeBytes());
assertEquals(20, conf.getAddressesSettings().get("a2").getPageCacheMaxSize());
assertEquals(8, conf.getAddressesSettings().get("a2").getMessageCounterHistoryDayLimit());
-
-
+
+
assertEquals(2, conf.getQueueConfigurations().size());
-
+
assertEquals("queue1", conf.getQueueConfigurations().get(0).getName());
assertEquals("address1", conf.getQueueConfigurations().get(0).getAddress());
assertEquals("color='red'", conf.getQueueConfigurations().get(0).getFilterString());
assertEquals(false, conf.getQueueConfigurations().get(0).isDurable());
-
+
assertEquals("queue2", conf.getQueueConfigurations().get(1).getName());
assertEquals("address2", conf.getQueueConfigurations().get(1).getAddress());
assertEquals("color='blue'", conf.getQueueConfigurations().get(1).getFilterString());
assertEquals(false, conf.getQueueConfigurations().get(1).isDurable());
-
+
assertEquals(2, conf.getSecurityRoles().size());
assertTrue(conf.getSecurityRoles().containsKey("a1"));
-
+
assertTrue(conf.getSecurityRoles().containsKey("a2"));
-
+
Role a1Role = conf.getSecurityRoles().get("a1").toArray(new Role[1])[0];
-
+
assertFalse(a1Role.isSend());
assertFalse(a1Role.isConsume());
assertFalse(a1Role.isCreateDurableQueue());
@@ -305,9 +304,9 @@
assertTrue(a1Role.isCreateNonDurableQueue());
assertFalse(a1Role.isDeleteNonDurableQueue());
assertFalse(a1Role.isManage());
-
+
Role a2Role = conf.getSecurityRoles().get("a2").toArray(new Role[1])[0];
-
+
assertFalse(a2Role.isSend());
assertFalse(a2Role.isConsume());
assertFalse(a2Role.isCreateDurableQueue());
@@ -315,8 +314,8 @@
assertFalse(a2Role.isCreateNonDurableQueue());
assertTrue(a2Role.isDeleteNonDurableQueue());
assertFalse(a2Role.isManage());
-
+
}
public void testSetGetConfigurationURL()
Modified: trunk/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml
===================================================================
--- trunk/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml 2012-02-16 14:07:03 UTC (rev 12128)
+++ trunk/hornetq-core/src/test/resources/ConfigurationTest-full-config.xml 2012-02-16 15:17:59 UTC (rev 12129)
@@ -35,6 +35,7 @@
<bindings-directory>somedir</bindings-directory>
<create-bindings-dir>false</create-bindings-dir>
<journal-directory>somedir2</journal-directory>
+ <page-max-concurrent-io>17</page-max-concurrent-io>
<create-journal-dir>false</create-journal-dir>
<journal-type>NIO</journal-type>
<journal-compact-min-files>123</journal-compact-min-files>
@@ -147,6 +148,7 @@
<forwarding-address>bridge-forwarding-address1</forwarding-address>
<filter string="sku > 1"/>
<transformer-class-name>org.foo.BridgeTransformer</transformer-class-name>
+ <min-large-message-size>4</min-large-message-size>
<retry-interval>3</retry-interval>
<retry-interval-multiplier>0.2</retry-interval-multiplier>
<reconnect-attempts>2</reconnect-attempts>
@@ -166,6 +168,7 @@
<cluster-connection name="cluster-connection1">
<address>queues1</address>
<connector-ref>connector1</connector-ref>
+ <min-large-message-size>321</min-large-message-size>
<retry-interval>3</retry-interval>
<use-duplicate-detection>true</use-duplicate-detection>
<forward-when-no-consumers>false</forward-when-no-consumers>
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12128 - in trunk: tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp and 3 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2012-02-16 09:07:03 -0500 (Thu, 16 Feb 2012)
New Revision: 12128
Modified:
trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java
trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
Log:
Tidy-up tearDown code to avoid any leakage and thus hangs.
Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/ServiceTestBase.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -606,24 +606,6 @@
}
}
- protected ServerLocator createInVMNonHALocator()
- {
- return createNonHALocator(false);
- }
-
- protected ServerLocator createNettyNonHALocator()
- {
- return createNonHALocator(true);
- }
-
- protected ServerLocator createNonHALocator(final boolean isNetty)
- {
- ServerLocator locatorWithoutHA = isNetty ? HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY))
- : HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
- return addServerLocator(locatorWithoutHA);
-
- }
-
protected ServerLocator createInVMLocator(final int serverID)
{
TransportConfiguration tnspConfig = createInVMTransportConnectorConfig(serverID, UUIDGenerator.getInstance().generateStringUUID());
Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -59,6 +59,7 @@
import org.hornetq.api.core.client.ClientMessage;
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.asyncio.impl.AsynchronousFileImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
@@ -1498,6 +1499,25 @@
}
+ protected ServerLocator createInVMNonHALocator()
+ {
+ return createNonHALocator(false);
+ }
+
+ protected ServerLocator createNettyNonHALocator()
+ {
+ return createNonHALocator(true);
+ }
+
+ protected ServerLocator createNonHALocator(final boolean isNetty)
+ {
+ ServerLocator locatorWithoutHA =
+ isNetty
+ ? HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NETTY_CONNECTOR_FACTORY))
+ : HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+ return addServerLocator(locatorWithoutHA);
+ }
+
protected static final void stopComponent(HornetQComponent component)
{
if (component == null)
@@ -1579,7 +1599,7 @@
}
}
- protected final void addSessionFactory(ClientSessionFactory sf)
+ protected final ClientSessionFactory addSessionFactory(ClientSessionFactory sf)
{
if (sf != null)
{
@@ -1588,6 +1608,7 @@
sessionFactories.add(sf);
}
}
+ return sf;
}
private void assertAllClientConsumersAreClosed()
Modified: trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java
===================================================================
--- trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/tests/concurrent-tests/src/test/java/org/hornetq/tests/concurrent/stomp/ConcurrentStompTest.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -60,22 +60,22 @@
sendFrame(stompSocket, connect);
String connected = receiveFrame(stompSocket, inputBuffer, 10000);
Assert.assertTrue(connected.startsWith("CONNECTED"));
-
+
sendFrame(stompSocket_2, connect);
connected = receiveFrame(stompSocket_2, inputBuffer_2, 10000);
Assert.assertTrue(connected.startsWith("CONNECTED"));
-
+
final int count = 1000;
final CountDownLatch latch = new CountDownLatch(count);
-
- String subscribe =
+
+ String subscribe =
"SUBSCRIBE\n" +
"destination:" + getQueueName() + "\n" +
"ack:auto\n\n" +
Stomp.NULL;
sendFrame(stompSocket_2, subscribe);
Thread.sleep(2000);
-
+
new Thread()
{
@Override
@@ -142,7 +142,7 @@
config.getAcceptorConfigurations().add(stompTransport);
config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
config.getQueueConfigurations().add(new CoreQueueConfiguration(getQueueName(), getQueueName(), null, false));
- return HornetQServers.newHornetQServer(config);
+ return addServer(HornetQServers.newHornetQServer(config));
}
@Override
@@ -157,7 +157,6 @@
{
stompSocket_2.close();
}
- server.stop();
super.tearDown();
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/String64KLimitTest.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -17,25 +17,26 @@
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.api.core.client.*;
+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.ServerLocator;
import org.hornetq.core.config.Configuration;
-import org.hornetq.core.config.impl.ConfigurationImpl;
-import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
/**
- *
+ *
* There is a bug in JDK1.3, 1.4 whereby writeUTF fails if more than 64K bytes are written
* we need to work with all size of strings
- *
+ *
* http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4806007
* http://jira.jboss.com/jira/browse/JBAS-2641
- *
+ *
* @author <a href="tim.fox(a)jboss.com">Tim Fox</a>
* @version $Revision: 6016 $
*
@@ -204,29 +205,11 @@
Configuration config = createBasicConfig();
config.setSecurityEnabled(false);
- config.getAcceptorConfigurations().add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
- server = HornetQServers.newHornetQServer(config, false);
+ config.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY));
+ server = addServer(HornetQServers.newHornetQServer(config, false));
server.start();
- locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
- sf = locator.createSessionFactory();
+ locator = createInVMNonHALocator();
+ sf = createSessionFactory(locator);
session = sf.createSession();
}
-
- @Override
- protected void tearDown() throws Exception
- {
- session.close();
-
- sf.close();
-
- locator.close();
-
- server.stop();
-
- server = null;
- sf = null;
- session = null;
-
- super.tearDown();
- }
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/BlockingSendTest.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -15,7 +15,12 @@
import junit.framework.Assert;
-import org.hornetq.api.core.client.*;
+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.ServerLocator;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
@@ -46,8 +51,6 @@
ClientSessionFactory factory = null;
ServerLocator locator = null;
- try
- {
server.getConfiguration().setJournalSyncNonTransactional(false);
server.getConfiguration().setJournalBufferTimeout_AIO(15000);
@@ -78,38 +81,5 @@
Assert.assertNotNull(msg);
msg.acknowledge();
-
- }
- finally
- {
- if (locator != null)
- {
- locator.close();
- }
- if (factory != null)
- {
- factory.close();
- }
-
- if (session != null)
- {
- session.close();
- }
-
- if (server != null)
- {
- server.stop();
- }
- }
-
}
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CoreClientTest.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -26,7 +26,6 @@
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.core.client.ServerLocator;
import org.hornetq.core.config.Configuration;
-import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
@@ -49,14 +48,12 @@
public void testCoreClientNetty() throws Exception
{
- testCoreClient("org.hornetq.core.remoting.impl.netty.NettyAcceptorFactory",
- "org.hornetq.core.remoting.impl.netty.NettyConnectorFactory");
+ testCoreClient(NETTY_ACCEPTOR_FACTORY, NETTY_CONNECTOR_FACTORY);
}
public void testCoreClientInVM() throws Exception
{
- testCoreClient("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory",
- "org.hornetq.core.remoting.impl.invm.InVMConnectorFactory");
+ testCoreClient(INVM_ACCEPTOR_FACTORY, INVM_CONNECTOR_FACTORY);
}
private void testCoreClient(final String acceptorFactoryClassName, final String connectorFactoryClassName) throws Exception
@@ -69,12 +66,14 @@
conf.getAcceptorConfigurations().add(new TransportConfiguration(acceptorFactoryClassName));
- HornetQServer server = HornetQServers.newHornetQServer(conf, false);
+ HornetQServer server = addServer(HornetQServers.newHornetQServer(conf, false));
server.start();
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(connectorFactoryClassName));
+ ServerLocator locator =
+ addServerLocator(HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(
+ connectorFactoryClassName)));
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = createSessionFactory(locator);
ClientSession session = sf.createSession(false, true, true);
@@ -121,19 +120,5 @@
message2.acknowledge();
}
-
- session.close();
-
- locator.close();
-
- server.stop();
}
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/CreateQueueIdempotentTest.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -13,100 +13,70 @@
package org.hornetq.tests.integration.client;
+import java.util.concurrent.atomic.AtomicInteger;
+
import junit.framework.Assert;
+
import org.hornetq.api.core.HornetQException;
import org.hornetq.api.core.SimpleString;
import org.hornetq.api.core.TransportConfiguration;
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.Configuration;
-import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
import org.hornetq.tests.util.ServiceTestBase;
-import java.util.concurrent.atomic.AtomicInteger;
-
public class CreateQueueIdempotentTest extends ServiceTestBase
{
- private static final Logger log = Logger.getLogger(CreateQueueIdempotentTest.class);
- // Constants -----------------------------------------------------
+ private HornetQServer server;
- // Attributes ----------------------------------------------------
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
- // Static --------------------------------------------------------
+ Configuration conf = createDefaultConfig();
+ conf.setSecurityEnabled(false);
+ conf.getAcceptorConfigurations().add(new TransportConfiguration(INVM_ACCEPTOR_FACTORY));
- // Constructors --------------------------------------------------
+ server = addServer(HornetQServers.newHornetQServer(conf, true));
+ server.start();
+ }
- // Public --------------------------------------------------------
+ public void testSequentialCreateQueueIdempotency() throws Exception
+ {
+ final SimpleString QUEUE = new SimpleString("SequentialCreateQueueIdempotency");
- public void testSequentialCreateQueueIdempotency() throws Exception
- {
- boolean success = false;
- final SimpleString QUEUE = new SimpleString("SequentialCreateQueueIdempotency");
+ ServerLocator locator = createInVMNonHALocator();
- Configuration conf = createDefaultConfig();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
- conf.setSecurityEnabled(false);
+ ClientSession session = sf.createSession(false, true, true);
- conf.getAcceptorConfigurations().add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
+ session.createQueue(QUEUE, QUEUE, null, true);
- HornetQServer server = HornetQServers.newHornetQServer(conf, true);
+ try
+ {
+ session.createQueue(QUEUE, QUEUE, null, true);
+ fail("Expected exception, queue already exists");
+ }
+ catch (HornetQException e)
+ {
+ assertEquals("Queue should exist!", HornetQException.QUEUE_EXISTS, e.getCode());
+ }
+ }
- server.start();
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
-
- ClientSessionFactory sf = locator.createSessionFactory();
-
- ClientSession session = sf.createSession(false, true, true);
-
- session.createQueue(QUEUE, QUEUE, null, true);
-
- try
- {
- session.createQueue(QUEUE, QUEUE, null, true);
- }
- catch (Exception e)
- {
- if (e instanceof HornetQException)
- {
- if (((HornetQException) e).getCode() == 101)
- {
- success = true;
- }
- }
- }
-
- session.close();
-
- locator.close();
-
- server.stop();
-
- Assert.assertTrue(success);
- }
-
public void testConcurrentCreateQueueIdempotency() throws Exception
{
- boolean success = true;
final String QUEUE = "ConcurrentCreateQueueIdempotency";
AtomicInteger queuesCreated = new AtomicInteger(0);
AtomicInteger failedAttempts = new AtomicInteger(0);
- Configuration conf = createDefaultConfig();
-
- conf.setSecurityEnabled(false);
-
- conf.getAcceptorConfigurations().add(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory"));
-
- HornetQServer server = HornetQServers.newHornetQServer(conf, true);
-
- server.start();
final int NUM_THREADS = 5;
-
+
QueueCreator[] queueCreators = new QueueCreator[NUM_THREADS];
@@ -129,20 +99,9 @@
server.stop();
// re-starting the server appears to be an unreliable guide
- try
- {
- server.start();
- } catch (Exception e)
- {
- System.out.println("THIS BLEW UP!!");
- e.printStackTrace();
- success = false;
- }
-
- server.stop();
+ server.start();
- Assert.assertTrue(success);
- Assert.assertEquals(1, queuesCreated.intValue());
+ Assert.assertEquals(1, queuesCreated.intValue());
Assert.assertEquals(NUM_THREADS - 1, failedAttempts.intValue());
}
@@ -175,8 +134,8 @@
try
{
- locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"));
- ClientSessionFactory sf = locator.createSessionFactory();
+ locator = createInVMNonHALocator();
+ ClientSessionFactory sf = locator.createSessionFactory();
session = sf.createSession(false, true, true);
final SimpleString QUEUE = new SimpleString(queueName);
session.createQueue(QUEUE, QUEUE, null, true);
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ExpiryLargeMessageTest.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -86,9 +86,6 @@
server.start();
- try
- {
-
server.createQueue(EXPIRY, EXPIRY, null, true, false);
server.createQueue(DLQ, DLQ, null, true, false);
@@ -97,7 +94,7 @@
ServerLocator locator = createInVMNonHALocator();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
ClientSession session = sf.createSession(true, true, 0);
@@ -133,17 +130,17 @@
producer.send(message);
}
-
+
session.close();
server.stop();
server.start();
-
+
Queue queueExpiry = server.locateQueue(EXPIRY);
Queue myQueue = server.locateQueue(MY_QUEUE);
sf = locator.createSessionFactory();
-
+
Thread.sleep(1500);
long timeout = System.currentTimeMillis() + 5000;
@@ -153,7 +150,7 @@
myQueue.expireReferences();
Thread.sleep(50);
}
-
+
assertEquals(50, queueExpiry.getMessageCount());
session = sf.createSession(false, false);
@@ -191,7 +188,7 @@
for (int location = 0; location < messageSize; location++)
{
- assertEquals(getSamplebyte((long)location), message.getBodyBuffer().readByte());
+ assertEquals(getSamplebyte(location), message.getBodyBuffer().readByte());
}
message.acknowledge();
}
@@ -246,7 +243,7 @@
for (int location = 0; location < messageSize; location++)
{
- assertEquals(getSamplebyte((long)location), message.getBodyBuffer().readByte());
+ assertEquals(getSamplebyte(location), message.getBodyBuffer().readByte());
}
message.acknowledge();
}
@@ -269,14 +266,9 @@
locator.close();
validateNoFilesOnLargeDir();
- }
- finally
- {
- server.stop();
- }
}
- /**
+ /**
* Tests if the system would still couple with old data where the LargeMessage was linked to its previous copy
* @throws Exception
*/
@@ -304,18 +296,15 @@
server.start();
- try
- {
+ server.createQueue(EXPIRY, EXPIRY, null, true, false);
- server.createQueue(EXPIRY, EXPIRY, null, true, false);
-
server.createQueue(DLQ, DLQ, null, true, false);
server.createQueue(MY_QUEUE, MY_QUEUE, null, true, false);
ServerLocator locator = createInVMNonHALocator();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
ClientSession session = sf.createSession(true, true, 0);
@@ -401,7 +390,7 @@
for (int location = 0; location < messageSize; location++)
{
- assertEquals(getSamplebyte((long)location), message.getBodyBuffer().readByte());
+ assertEquals(getSamplebyte(location), message.getBodyBuffer().readByte());
}
message.acknowledge();
}
@@ -409,13 +398,6 @@
session.commit();
session.close();
- sf.close();
- locator.close();
- }
- finally
- {
- server.stop();
- }
}
// Package protected ---------------------------------------------
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -125,7 +125,7 @@
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(false, false, false);
@@ -203,15 +203,13 @@
ClientSession session = null;
- try
- {
HornetQServer server = createServer(true, isNetty());
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
- session = sf.createSession(false, false, false);
+ session = addClientSession(sf.createSession(false, false, false));
session.createTemporaryQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS);
@@ -245,17 +243,6 @@
session.close();
validateNoFilesOnLargeDir();
- }
- finally
- {
- try
- {
- session.close();
- }
- catch (Throwable ignored)
- {
- }
- }
}
public void testLargeBufferTransacted() throws Exception
@@ -276,8 +263,6 @@
ClientSession session = null;
- try
- {
Configuration config = createDefaultConfig(isNetty());
config.setJournalFileSize(journalsize);
@@ -288,9 +273,9 @@
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
- session = sf.createSession(!transacted, !transacted, 0);
+ session = addClientSession(sf.createSession(!transacted, !transacted, 0));
session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS, true);
@@ -336,18 +321,7 @@
session.close();
validateNoFilesOnLargeDir();
- }
- finally
- {
- try
- {
- session.close();
}
- catch (Throwable ignored)
- {
- }
- }
- }
public void testDLALargeMessage() throws Exception
{
@@ -355,15 +329,13 @@
ClientSession session = null;
- try
- {
HornetQServer server = createServer(true, isNetty());
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
- session = sf.createSession(false, false, false);
+ session = addClientSession(sf.createSession(false, false, false));
session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS, true);
session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS.concat("-2"), true);
@@ -455,18 +427,7 @@
session.close();
validateNoFilesOnLargeDir();
- }
- finally
- {
- try
- {
- session.close();
}
- catch (Throwable ignored)
- {
- }
- }
- }
public void testDeliveryCount() throws Exception
{
@@ -474,13 +435,11 @@
ClientSession session = null;
- try
- {
HornetQServer server = createServer(true, isNetty());
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(false, false, false);
@@ -530,17 +489,7 @@
session.commit();
validateNoFilesOnLargeDir();
- }
- finally
- {
- try
- {
- session.close();
- }
- catch (Throwable ignored)
- {
- }
- }
+
}
public void testDLAOnExpiryNonDurableMessage() throws Exception
@@ -549,13 +498,11 @@
ClientSession session = null;
- try
- {
HornetQServer server = createServer(true, isNetty());
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
SimpleString ADDRESS_DLA = LargeMessageTest.ADDRESS.concat("-dla");
SimpleString ADDRESS_EXPIRY = LargeMessageTest.ADDRESS.concat("-expiry");
@@ -658,17 +605,7 @@
server.start();
validateNoFilesOnLargeDir();
- }
- finally
- {
- try
- {
- session.close();
- }
- catch (Throwable ignored)
- {
- }
- }
+
}
public void testDLAOnExpiry() throws Exception
@@ -677,13 +614,11 @@
ClientSession session = null;
- try
- {
- HornetQServer server = createServer(true, isNetty());
+ HornetQServer server = createServer(true, isNetty());
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
SimpleString ADDRESS_DLA = LargeMessageTest.ADDRESS.concat("-dla");
SimpleString ADDRESS_EXPIRY = LargeMessageTest.ADDRESS.concat("-expiry");
@@ -786,17 +721,6 @@
validateNoFilesOnLargeDir();
}
- finally
- {
- try
- {
- session.close();
- }
- catch (Throwable ignored)
- {
- }
- }
- }
public void testExpiryLargeMessage() throws Exception
{
@@ -818,7 +742,7 @@
server.getAddressSettingsRepository().addMatch("*", addressSettings);
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(false, false, false);
@@ -919,7 +843,7 @@
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(true, true, 0);
@@ -944,28 +868,28 @@
producer.send(clientFile);
}
-
+
ClientConsumer consumer = session.createConsumer(ADDRESS);
-
+
session.start();
-
+
ClientMessage msg = consumer.receive(10000);
-
+
for (int i = 0 ; i < messageSize; i++)
{
assertEquals(getSamplebyte(i), msg.getBodyBuffer().readByte());
}
-
+
assertNotNull(msg);
-
+
msg.acknowledge();
-
+
assertNull(consumer.receiveImmediate());
-
+
session.commit();
-
+
validateNoFilesOnLargeDir();
-
+
}
finally
{
@@ -1000,7 +924,7 @@
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(false, false, false);
@@ -1084,7 +1008,7 @@
locator.setCacheLargeMessagesClient(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(false, false, false);
@@ -2005,7 +1929,7 @@
SimpleString queue[] = new SimpleString[] { new SimpleString("queue1"), new SimpleString("queue2") };
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -2073,7 +1997,7 @@
SimpleString queue[] = new SimpleString[] { new SimpleString("queue1"), new SimpleString("queue2") };
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -2141,7 +2065,7 @@
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(isXA, false, false);
@@ -2204,7 +2128,7 @@
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
ClientSession session = sf.createSession(isXA, false, false);
@@ -2329,7 +2253,7 @@
locator.setMinLargeMessageSize(1024);
locator.setConsumerWindowSize(1024 * 1024);
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(null, null, false, false, false, false, 0);
@@ -2432,7 +2356,7 @@
locator.setMinLargeMessageSize(1024);
locator.setConsumerWindowSize(1024 * 1024);
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(null, null, false, false, false, false, 0);
@@ -2543,7 +2467,7 @@
locator.setBlockOnDurableSend(true);
locator.setBlockOnAcknowledge(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
@@ -2682,7 +2606,7 @@
locator.setBlockOnAcknowledge(true);
locator.setCompressLargeMessage(true);
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
ClientSession session = sf.createSession(false, true, true);
@@ -2792,7 +2716,7 @@
locator.setMinLargeMessageSize(100 * 1024);
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(null, null, false, true, true, false, 0);
@@ -2857,8 +2781,6 @@
final int SIZE = 10 * 1024;
final int NUMBER_OF_MESSAGES = 1;
- try
- {
server = createServer(true, isNetty());
@@ -2866,7 +2788,7 @@
locator.setMinLargeMessageSize(1024);
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
session = sf.createSession(null, null, false, true, true, false, 0);
@@ -2914,25 +2836,6 @@
((Queue)server.getPostOffice().getBinding(LargeMessageTest.ADDRESS).getBindable()).getMessageCount());
log.debug("Thread done");
- }
- finally
- {
- try
- {
- session.close();
- }
- catch (Throwable ignored)
- {
- }
-
- try
- {
- server.stop();
- }
- catch (Throwable ignored)
- {
- }
- }
}
// The ClientConsumer should be able to also send ServerLargeMessages as that's done by the CoreBridge
@@ -2942,13 +2845,12 @@
server.start();
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
ClientSession session = sf.createSession(false, false);
- try
- {
- LargeServerMessageImpl fileMessage = new LargeServerMessageImpl((JournalStorageManager)server.getStorageManager());
+ LargeServerMessageImpl fileMessage =
+ new LargeServerMessageImpl((JournalStorageManager)server.getStorageManager());
fileMessage.setMessageID(1005);
@@ -2990,13 +2892,6 @@
msg.acknowledge();
session.commit();
-
- }
- finally
- {
- sf.close();
- server.stop();
- }
}
// Package protected ---------------------------------------------
@@ -3011,13 +2906,6 @@
locator = createFactory(isNetty());
}
- @Override
- protected void tearDown() throws Exception
- {
- locator.close();
- super.tearDown();
- }
-
protected void testPageOnLargeMessage(final boolean realFiles, final boolean sendBlocking) throws Exception
{
Configuration config = createDefaultConfig(isNetty());
@@ -3037,7 +2925,7 @@
final int numberOfBytesBigMessage = 400000;
- ClientSessionFactory sf = locator.createSessionFactory();
+ ClientSessionFactory sf = addSessionFactory(locator.createSessionFactory());
if (sendBlocking)
{
Modified: trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
===================================================================
--- trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2012-02-16 14:06:15 UTC (rev 12127)
+++ trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2012-02-16 14:07:03 UTC (rev 12128)
@@ -36,14 +36,14 @@
public abstract class JMSTestCase extends TestCase
{
public static final String PROP_FILE_NAME = "provider.properties";
-
+
public static boolean startServer = true;
protected Admin admin;
/**
* Fails a test with an exception which will be used for a message.
- *
+ *
* If the exception is an instance of <code>javax.jms.JMSException</code>, the
* message of the failure will contained both the JMSException and its linked exception
* (provided there's one).
@@ -73,7 +73,7 @@
}
/**
- * Should be overriden
+ * Should be overriden
* @return
*/
protected Properties getProviderProperties() throws IOException
@@ -103,13 +103,19 @@
@Override
protected void tearDown() throws Exception
{
- admin.stop();
+ try
+ {
+ admin.stop();
- if (startServer)
+ if (startServer)
+ {
+ admin.stopServer();
+ }
+ }
+ finally
{
- admin.stopServer();
+ super.tearDown();
}
- super.tearDown();
}
}
13 years, 10 months
- 1
- 0
JBoss hornetq SVN: r12127 - trunk/hornetq-core/src/test/java/org/hornetq/tests/util.
by do-not-reply＠jboss.org
Author: borges
Date: 2012-02-16 09:06:15 -0500 (Thu, 16 Feb 2012)
New Revision: 12127
Modified:
trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java
Log:
Wrap assert's inside try-finally
Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-02-16 11:39:06 UTC (rev 12126)
+++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2012-02-16 14:06:15 UTC (rev 12127)
@@ -943,9 +943,13 @@
closeAllSessionFactories();
closeAllServerLocatorsFactories();
+ try
+ {
assertAllClientConsumersAreClosed();
assertAllClientSessionsAreClosed();
-
+ }
+ finally
+ {
synchronized (servers)
{
for (HornetQServer server : servers)
@@ -1080,6 +1084,7 @@
clearData();
super.tearDown();
}
+ }
/**
*
13 years, 10 months
- 1
- 0