[jboss-cvs] JBoss Messaging SVN: r5390 - in trunk: tests/src/org/jboss/messaging/tests/integration/cluster/failover and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 19 08:51:58 EST 2008
Author: ataylor
Date: 2008-11-19 08:51:57 -0500 (Wed, 19 Nov 2008)
New Revision: 5390
Added:
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreCommitMessageTest.java
Modified:
trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
Log:
tweaks for pre commit functionality
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-11-19 12:38:20 UTC (rev 5389)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-11-19 13:51:57 UTC (rev 5390)
@@ -542,7 +542,7 @@
return HandleStatus.NO_MATCH;
}
- if (!browseOnly || preCommitAcks)
+ if (!browseOnly && !preCommitAcks)
{
deliveringRefs.add(ref);
}
Added: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreCommitMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreCommitMessageTest.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreCommitMessageTest.java 2008-11-19 13:51:57 UTC (rev 5390)
@@ -0,0 +1,215 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.messaging.tests.integration.cluster.failover;
+
+import junit.framework.TestCase;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.server.MessagingService;
+import org.jboss.messaging.core.server.impl.MessagingServiceImpl;
+import org.jboss.messaging.core.client.impl.ClientSessionFactoryInternal;
+import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
+import org.jboss.messaging.core.client.impl.ClientSessionImpl;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.config.TransportConfiguration;
+import org.jboss.messaging.core.config.Configuration;
+import org.jboss.messaging.core.config.impl.ConfigurationImpl;
+import org.jboss.messaging.core.remoting.RemotingConnection;
+import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.remoting.impl.invm.InVMRegistry;
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.util.SimpleString;
+import org.jboss.messaging.jms.client.JBossTextMessage;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ */
+public class FailoverPreCommitMessageTest extends TestCase
+{
+ private static final Logger log = Logger.getLogger(FailoverPreCommitMessageTest.class);
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private static final SimpleString ADDRESS = new SimpleString("FailoverTestAddress");
+
+ private MessagingService liveService;
+
+ private MessagingService backupService;
+
+ private final Map<String, Object> backupParams = new HashMap<String, Object>();
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ /*
+ * Set messages to expire very soon, send a load of them, so at some of them get expired when they reach the client
+ * After failover make sure all are received ok
+ */
+ public void testPreCommitFailoverTest() throws Exception
+ {
+ ClientSessionFactoryInternal sf1 = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"),
+ new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
+ backupParams));
+
+ sf1.setSendWindowSize(32 * 1024);
+
+ ClientSession session1 = sf1.createSession(false, true, true, true);
+
+ session1.createQueue(ADDRESS, ADDRESS, null, false, false, true);
+
+ session1.start();
+
+ ClientProducer producer = session1.createProducer(ADDRESS);
+
+ final int numMessages = 10000;
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message = session1.createClientMessage(JBossTextMessage.TYPE,
+ false);
+ message.putIntProperty(new SimpleString("count"), i);
+ message.getBody().putString("more aardvarks");
+ message.getBody().flip();
+ producer.send(message);
+ }
+ ClientConsumer consumer1 = session1.createConsumer(ADDRESS);
+
+ final RemotingConnection conn1 = ((ClientSessionImpl)session1).getConnection();
+
+ Thread t = new Thread()
+ {
+ public void run()
+ {
+ try
+ {
+ //Sleep a little while to ensure that some messages are consumed before failover
+ Thread.sleep(5000);
+ }
+ catch (InterruptedException e)
+ {
+ }
+
+ conn1.fail(new MessagingException(MessagingException.NOT_CONNECTED));
+ }
+ };
+
+ t.start();
+
+ int count = 0;
+
+ while (true)
+ {
+ ClientMessage message = consumer1.receive(1000);
+
+ if (message != null)
+ {
+ message.acknowledge();
+
+ //We sleep a little to make sure messages aren't consumed too quickly and some
+ //will expire before reaching consumer
+ Thread.sleep(1);
+
+ count++;
+ }
+ else
+ {
+ log.info("message was null");
+ break;
+ }
+ }
+
+ log.info("Got " + count + " messages");
+
+ t.join();
+
+ session1.close();
+
+ //Make sure no more messages
+ ClientSession session2 = sf1.createSession(false, true, true);
+
+ session2.start();
+
+ ClientConsumer consumer2 = session2.createConsumer(ADDRESS);
+
+ ClientMessage message = consumer2.receive(1000);
+
+ assertNull(message);
+
+ session2.close();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ Configuration backupConf = new ConfigurationImpl();
+ backupConf.setSecurityEnabled(false);
+ backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
+ backupConf.getAcceptorConfigurations()
+ .add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory",
+ backupParams));
+ backupConf.setBackup(true);
+ backupService = MessagingServiceImpl.newNullStorageMessagingServer(backupConf);
+ backupService.start();
+
+ Configuration liveConf = new ConfigurationImpl();
+ liveConf.setSecurityEnabled(false);
+ liveConf.getAcceptorConfigurations()
+ .add(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory"));
+ liveConf.setBackupConnectorConfiguration(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
+ backupParams));
+ liveService = MessagingServiceImpl.newNullStorageMessagingServer(liveConf);
+ liveService.start();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ assertEquals(0, backupService.getServer().getRemotingService().getConnections().size());
+
+ backupService.stop();
+
+ assertEquals(0, liveService.getServer().getRemotingService().getConnections().size());
+
+ liveService.stop();
+
+ assertEquals(0, InVMRegistry.instance.size());
+ }
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
+
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java 2008-11-19 12:38:20 UTC (rev 5389)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/consumer/ConsumerTest.java 2008-11-19 13:51:57 UTC (rev 5390)
@@ -514,6 +514,47 @@
session.close();
}
+ public void testConsumerAckImmediateCloseSession() throws Exception
+ {
+
+ ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
+
+ ClientSession session = sf.createSession(false, true, true, true);
+
+ session.createQueue(QUEUE, QUEUE, null, false, false, true);
+
+ ClientProducer producer = session.createProducer(QUEUE);
+
+ final int numMessages = 100;
+
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message = createMessage(session, "m" + i);
+ producer.send(message);
+ }
+
+ ClientConsumer consumer = session.createConsumer(QUEUE);
+ session.start();
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message2 = consumer.receive(1000);
+
+ assertEquals("m" + i, message2.getBody().getString());
+ if(i < 50)
+ {
+ message2.acknowledge();
+ }
+ }
+ // assert that all the messages are there and none have been acked
+ assertEquals(messagingService.getServer().getPostOffice().getBinding(QUEUE).getQueue().getDeliveringCount(), 0);
+ assertEquals(messagingService.getServer().getPostOffice().getBinding(QUEUE).getQueue().getMessageCount(), 0);
+
+ session.close();
+
+ assertEquals(messagingService.getServer().getPostOffice().getBinding(QUEUE).getQueue().getDeliveringCount(), 0);
+ assertEquals(messagingService.getServer().getPostOffice().getBinding(QUEUE).getQueue().getMessageCount(), 0);
+ }
+
private ClientMessage createMessage(ClientSession session, String msg)
{
ClientMessage message = session.createClientMessage(JBossTextMessage.TYPE,
More information about the jboss-cvs-commits
mailing list