[jboss-cvs] JBoss Messaging SVN: r1829 - in trunk: src/main/org/jboss/jms/client/container src/main/org/jboss/messaging/core/plugin/postoffice/cluster tests/src/org/jboss/test/messaging/jms/clustering
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 20 01:06:19 EST 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-12-20 01:06:06 -0500 (Wed, 20 Dec 2006)
New Revision: 1829
Modified:
trunk/src/main/org/jboss/jms/client/container/HAAspect.java
trunk/src/main/org/jboss/jms/client/container/TransactionAspect.java
trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/LocalClusteredQueue.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
trunk/tests/src/org/jboss/test/messaging/jms/clustering/ValveTest.java
Log:
various tweaks before the Beta release
Modified: trunk/src/main/org/jboss/jms/client/container/HAAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/HAAspect.java 2006-12-20 05:46:30 UTC (rev 1828)
+++ trunk/src/main/org/jboss/jms/client/container/HAAspect.java 2006-12-20 06:06:06 UTC (rev 1829)
@@ -662,25 +662,6 @@
}
- // Debug information about interceptors
- private void printInterceptors(Interceptor interceptors[])
- {
- if (interceptors==null || interceptors.length==0)
- {
- log.info("Interceptor chain is empty");
- }
- else
- {
- for (int i=0; i<interceptors.length; i++)
- {
- log.info("Interceptor[" + i + "] = " + interceptors[i].getName() + " className= " + interceptors[i].getClass().getName());
- }
- }
- }
-
-
-
-
/** I have moved this ConnectionListener to ValveAspect (from HAAspect) because
* it needs to use the same valve as exception listeners.
* While we are processing failover, we should block any calls on the client side.
Modified: trunk/src/main/org/jboss/jms/client/container/TransactionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/TransactionAspect.java 2006-12-20 05:46:30 UTC (rev 1828)
+++ trunk/src/main/org/jboss/jms/client/container/TransactionAspect.java 2006-12-20 06:06:06 UTC (rev 1829)
@@ -202,7 +202,8 @@
ClientSessionDelegate connectionConsumerDelegate =
(ClientSessionDelegate)info.getConnectionConsumerSession();
- int sessionId = connectionConsumerDelegate != null ? connectionConsumerDelegate.getID() : state.getSessionId();
+ int sessionId = connectionConsumerDelegate != null ?
+ connectionConsumerDelegate.getID() : state.getSessionId();
connState.getResourceManager().addAck(txID, sessionId, info);
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/LocalClusteredQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/LocalClusteredQueue.java 2006-12-20 05:46:30 UTC (rev 1828)
+++ trunk/src/main/org/jboss/messaging/core/plugin/postoffice/cluster/LocalClusteredQueue.java 2006-12-20 06:06:06 UTC (rev 1829)
@@ -140,18 +140,15 @@
* persist the message even if it is persistent - this is because persistent messages
* are always persisted on the sending node before sending.
*/
- public Delivery handleFromCluster(MessageReference ref)
- throws Exception
+ public Delivery handleFromCluster(MessageReference ref) throws Exception
{
- if (trace) { log.trace("Handling ref from cluster: " + ref); }
-
- log.info("********** Handling ref from cluster: " + ref);
-
+ if (trace) { log.trace(this + " handling " + ref + " from cluster"); }
+
if (filter != null && !filter.accept(ref))
{
Delivery del = new SimpleDelivery(this, ref, true, false);
- if (trace) { log.trace("Reference " + ref + " rejected by filter"); }
+ if (trace) { log.trace(this + " " + ref + " rejected by filter"); }
return del;
}
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java 2006-12-20 05:46:30 UTC (rev 1828)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java 2006-12-20 06:06:06 UTC (rev 1829)
@@ -45,6 +45,10 @@
{
}
+
+ // If you're wondering why this test is commented out,
+ // see http://jira.jboss.com/jira/browse/JBMESSAGING-688
+
// public void testForwardingMessageAmongNodes() throws Exception
// {
// Connection conn = null;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2006-12-20 05:46:30 UTC (rev 1828)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java 2006-12-20 06:06:06 UTC (rev 1829)
@@ -49,33 +49,29 @@
try
{
conn = cf.createConnection();
-
- // send a message
-
- Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageProducer p = s.createProducer(queue[0]);
- p.setDeliveryMode(DeliveryMode.PERSISTENT);
- p.send(s.createTextMessage("blip"));
-
conn.close();
- // create a connection to a node we'll kill soon (node 1)
-
conn = cf.createConnection();
- s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer c = s.createConsumer(queue[2]); // TODO What happens if I use queue[1]?
conn.start();
+ // create a producer/consumer on node 1
+
// make sure we're connecting to node 1
- int nodeID =
- ((ConnectionState)((DelegateSupport)((JBossConnection)conn).getDelegate()).getState()).
- getServerID();
+ int nodeID = ((ConnectionState)((DelegateSupport)((JBossConnection)conn).
+ getDelegate()).getState()).getServerID();
assertEquals(1, nodeID);
- log.info("consumer created");
+ Session s1 = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageConsumer c1 = s1.createConsumer(queue[1]);
+ MessageProducer p1 = s1.createProducer(queue[1]);
+ p1.setDeliveryMode(DeliveryMode.PERSISTENT);
+ // send a message
+
+ p1.send(s1.createTextMessage("blip"));
+
// kill node 1
ServerManagement.kill(1);
@@ -90,7 +86,7 @@
// we must receive the message
- TextMessage tm = (TextMessage)c.receive(1000);
+ TextMessage tm = (TextMessage)c1.receive(1000);
assertEquals("blip", tm.getText());
}
@@ -109,7 +105,7 @@
protected void setUp() throws Exception
{
- nodeCount = 3;
+ nodeCount = 2;
super.setUp();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2006-12-20 05:46:30 UTC (rev 1828)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2006-12-20 06:06:06 UTC (rev 1829)
@@ -81,13 +81,15 @@
// Public --------------------------------------------------------
- // this test was created per JBMESSAGING-685
- // as this required a ClusteredConnectionFactory I kept it into HATest but we can move it if we want
+ //
+
+ /**
+ * This test was created as per http://jira.jboss.org/jira/browse/JBMESSAGING-685.
+ */
public void testEmptyCommit() throws Exception
{
- JBossConnectionFactory factory = (JBossConnectionFactory) ic[1].lookup("/ConnectionFactory");
Connection conn = cf.createConnection();
- JBossSession session = (JBossSession) conn.createSession(true, Session.SESSION_TRANSACTED);
+ JBossSession session = (JBossSession)conn.createSession(true, Session.SESSION_TRANSACTED);
session.commit();
conn.close();
}
@@ -214,92 +216,6 @@
}
- public void testTopicSubscriber() throws Exception
- {
- log.info("++testTopicSubscriber");
-
- log.info(">>Lookup Queue");
- Destination destination = (Destination) topic[1];
-
-
- JBossConnectionFactory factory = (JBossConnectionFactory) ic[1].lookup("/ConnectionFactory");
- Connection conn1 = cf.createConnection();
- Connection conn2 = cf.createConnection();
- Connection conn3 = cf.createConnection();
-
-
- this.checkConnectionsDifferentServers(new Connection[]{conn1, conn2, conn3});
- JBossConnection conn = (JBossConnection) getConnection(new Connection[]{conn1, conn2, conn3}, 1);
-
- conn.setClientID("testClient");
- conn.start();
-
- JBossSession session = (JBossSession) conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
- ClientSessionDelegate clientSessionDelegate = (ClientSessionDelegate) session.getDelegate();
- SessionState sessionState = (SessionState) clientSessionDelegate.getState();
-
- MessageConsumer consumerHA = session.createDurableSubscriber((Topic) destination, "T1");
- JBossMessageConsumer jbossConsumerHA = (JBossMessageConsumer) consumerHA;
-
- org.jboss.jms.client.delegate.ClientConsumerDelegate clientDelegate = (org.jboss.jms.client.delegate.ClientConsumerDelegate) jbossConsumerHA.getDelegate();
- ConsumerState consumerState = (ConsumerState) clientDelegate.getState();
-
- log.info("subscriptionName=" + consumerState.getSubscriptionName());
-
-
- log.info(">>Creating Producer");
- MessageProducer producer = session.createProducer(destination);
- log.info(">>creating Message");
- Message message = session.createTextMessage("Hello Before");
- log.info(">>sending Message");
- producer.send(message);
- session.commit();
-
- receiveMessage("consumerHA", consumerHA, true, false);
-
- session.commit();
- //if (true) return;
-
- Object txID = sessionState.getCurrentTxId();
-
- producer.send(session.createTextMessage("Hello again before failover"));
-
- ClientConnectionDelegate delegate = (ClientConnectionDelegate) conn.getDelegate();
-
- JMSRemotingConnection originalRemoting = delegate.getRemotingConnection();
-
- ServerManagement.kill(1);
-
- Thread.sleep(30000);
- // if failover happened, this object was replaced
- assertNotSame(originalRemoting, delegate.getRemotingConnection());
-
- //System.out.println("Kill server1"); Thread.sleep(10000);
-
- message = session.createTextMessage("Hello After");
- log.info(">>Sending new message");
- producer.send(message);
-
- assertEquals(txID, sessionState.getCurrentTxId());
- System.out.println("TransactionID on client = " + txID);
- log.info(">>Final commit");
-
- session.commit();
-
- log.info("Calling alternate receiver");
- receiveMessage("consumerHA", consumerHA, true, false);
- receiveMessage("consumerHA", consumerHA, true, false);
- receiveMessage("consumerHA", consumerHA, true, true);
-
-
- session.commit();
- conn1.close();
- conn2.close();
- conn3.close();
-
- }
-
-
// public void testQueueHA() throws Exception
// {
// log.info("++testTopicSubscriber");
@@ -1133,8 +1049,95 @@
}
}
+
+ public void testTopicSubscriber() throws Exception
+ {
+ log.info("++testTopicSubscriber");
+
+ log.info(">>Lookup Queue");
+ Destination destination = (Destination) topic[1];
+
+
+ JBossConnectionFactory factory = (JBossConnectionFactory) ic[1].lookup("/ConnectionFactory");
+ Connection conn1 = cf.createConnection();
+ Connection conn2 = cf.createConnection();
+ Connection conn3 = cf.createConnection();
+
+
+ this.checkConnectionsDifferentServers(new Connection[]{conn1, conn2, conn3});
+ JBossConnection conn =
+ (JBossConnection) getConnection(new Connection[]{conn1, conn2, conn3}, 1);
+
+ conn.setClientID("testClient");
+ conn.start();
+
+ JBossSession session = (JBossSession) conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
+ ClientSessionDelegate clientSessionDelegate = (ClientSessionDelegate) session.getDelegate();
+ SessionState sessionState = (SessionState) clientSessionDelegate.getState();
+
+ MessageConsumer consumerHA = session.createDurableSubscriber((Topic) destination, "T1");
+ JBossMessageConsumer jbossConsumerHA = (JBossMessageConsumer) consumerHA;
+
+ org.jboss.jms.client.delegate.ClientConsumerDelegate clientDelegate =
+ (org.jboss.jms.client.delegate.ClientConsumerDelegate) jbossConsumerHA.getDelegate();
+ ConsumerState consumerState = (ConsumerState) clientDelegate.getState();
+
+ log.info("subscriptionName=" + consumerState.getSubscriptionName());
+
+
+ log.info(">>Creating Producer");
+ MessageProducer producer = session.createProducer(destination);
+ log.info(">>creating Message");
+ Message message = session.createTextMessage("Hello Before");
+ log.info(">>sending Message");
+ producer.send(message);
+ session.commit();
+
+ receiveMessage("consumerHA", consumerHA, true, false);
+
+ session.commit();
+ //if (true) return;
+
+ Object txID = sessionState.getCurrentTxId();
+
+ producer.send(session.createTextMessage("Hello again before failover"));
+
+ ClientConnectionDelegate delegate = (ClientConnectionDelegate) conn.getDelegate();
+
+ JMSRemotingConnection originalRemoting = delegate.getRemotingConnection();
+
+ ServerManagement.kill(1);
+
+ Thread.sleep(30000);
+ // if failover happened, this object was replaced
+ assertNotSame(originalRemoting, delegate.getRemotingConnection());
+
+ //System.out.println("Kill server1"); Thread.sleep(10000);
+
+ message = session.createTextMessage("Hello After");
+ log.info(">>Sending new message");
+ producer.send(message);
+
+ assertEquals(txID, sessionState.getCurrentTxId());
+ System.out.println("TransactionID on client = " + txID);
+ log.info(">>Final commit");
+
+ session.commit();
+
+ log.info("Calling alternate receiver");
+ receiveMessage("consumerHA", consumerHA, true, false);
+ receiveMessage("consumerHA", consumerHA, true, false);
+ receiveMessage("consumerHA", consumerHA, true, true);
+
+
+ session.commit();
+ conn1.close();
+ conn2.close();
+ conn3.close();
+
+ }
+
-
// public void testConnectionFactoryConnect() throws Exception
// {
// try
Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ValveTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ValveTest.java 2006-12-20 05:46:30 UTC (rev 1828)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ValveTest.java 2006-12-20 06:06:06 UTC (rev 1829)
@@ -243,7 +243,6 @@
//
// assertEquals(messageCounterProducer, messageCounterConsumer);
//
-
}
// Protected -----------------------------------------------------
More information about the jboss-cvs-commits
mailing list