Author: tabish
Date: Wed Feb 9 15:23:38 2011
New Revision: 1068935
URL: http://svn.apache.org/viewvc?rev=1068935&view=rev
Log:
Adding test and fix for https://issues.apache.org/jira/browse/AMQ-3140 using
included patch with modifications.
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java
(with props)
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
activemq/trunk/activemq-core/src/test/resources/log4j.properties
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java?rev=1068935&r1=1068934&r2=1068935&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/scheduler/JobSchedulerImpl.java
Wed Feb 9 15:23:38 2011
@@ -88,7 +88,7 @@ class JobSchedulerImpl extends ServiceSu
this.jobListeners.remove(l);
}
- public void schedule(final String jobId, final ByteSequence payload, final
long delay) throws IOException {
+ public synchronized void schedule(final String jobId, final ByteSequence
payload, final long delay) throws IOException {
this.store.getPageFile().tx().execute(new
Transaction.Closure<IOException>() {
public void execute(Transaction tx) throws IOException {
schedule(tx, jobId, payload, "", 0, delay, 0);
@@ -96,7 +96,7 @@ class JobSchedulerImpl extends ServiceSu
});
}
- public void schedule(final String jobId, final ByteSequence payload, final
String cronEntry) throws Exception {
+ public synchronized void schedule(final String jobId, final ByteSequence
payload, final String cronEntry) throws Exception {
this.store.getPageFile().tx().execute(new
Transaction.Closure<IOException>() {
public void execute(Transaction tx) throws IOException {
schedule(tx, jobId, payload, cronEntry, 0, 0, 0);
@@ -105,7 +105,7 @@ class JobSchedulerImpl extends ServiceSu
}
- public void schedule(final String jobId, final ByteSequence payload, final
String cronEntry, final long delay,
+ public synchronized void schedule(final String jobId, final ByteSequence
payload, final String cronEntry, final long delay,
final long period, final int repeat) throws IOException {
this.store.getPageFile().tx().execute(new
Transaction.Closure<IOException>() {
public void execute(Transaction tx) throws IOException {
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java?rev=1068935&r1=1068934&r2=1068935&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/broker/scheduler/JobSchedulerTest.java
Wed Feb 9 15:23:38 2011
@@ -163,9 +163,9 @@ public class JobSchedulerTest {
for (int i = 0; i < COUNT; i++) {
String str = new String("test" + i);
-
+
scheduler.schedule(ID + i, new ByteSequence(str.getBytes()),
"", start + (i * 1000), 10000 + i, 0);
-
+
}
start = System.currentTimeMillis();
long finish = start + 12000+ (COUNT * 1000);
@@ -188,9 +188,9 @@ public class JobSchedulerTest {
for (int i = 0; i < COUNT; i++) {
String str = new String("test" + i);
-
+
scheduler.schedule(ID + i, new ByteSequence(str.getBytes()),
"", start + (i * 1000), 10000 + i, 0);
-
+
}
start = System.currentTimeMillis();
long finish = start + 12000+ (COUNT * 1000);
@@ -201,7 +201,7 @@ public class JobSchedulerTest {
@Before
public void setUp() throws Exception {
- File directory = new File("target/test/ScheduledDB");
+ File directory = new File("target/test/ScheduledJobsDB");
IOHelper.mkdirs(directory);
IOHelper.deleteChildren(directory);
startStore(directory);
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java?rev=1068935&view=auto
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java
(added)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java
Wed Feb 9 15:23:38 2011
@@ -0,0 +1,144 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.bugs;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ScheduledMessage;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.util.IOHelper;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AMQ3140Test {
+
+ private static final int MESSAGES_PER_THREAD = 100;
+
+ private static final int THREAD_COUNT = 10;
+
+ private BrokerService broker;
+
+ private static final String QUEUE_NAME = "test";
+
+ private static class Sender extends Thread {
+
+ private static final int DELAY = 3000;
+
+ @Override
+ public void run() {
+ try {
+ ConnectionFactory cf = new
ActiveMQConnectionFactory("vm://localhost");
+ Connection connection = cf.createConnection();
+ connection.start();
+ Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer =
session.createProducer(session.createQueue(QUEUE_NAME));
+ Message message = session.createTextMessage("test");
+ for (int i = 0; i < MESSAGES_PER_THREAD; i++) {
+
message.setLongProperty(ScheduledMessage.AMQ_SCHEDULED_DELAY, DELAY);
+ producer.send(message);
+ }
+ session.close();
+ connection.close();
+ } catch (JMSException e) {
+ fail(e.getMessage());
+ }
+ }
+ }
+
+ @Before
+ public void setup() throws Exception {
+ File schedulerDirectory = new File("target/test/ScheduledDB");
+
+ IOHelper.mkdirs(schedulerDirectory);
+ IOHelper.deleteChildren(schedulerDirectory);
+
+ broker = new BrokerService();
+ broker.setSchedulerSupport(true);
+ broker.setPersistent(false);
+ broker.setDeleteAllMessagesOnStartup(true);
+ broker.setDataDirectory("target");
+ broker.setSchedulerDirectoryFile(schedulerDirectory);
+ broker.setUseJmx(false);
+ broker.addConnector("vm://localhost");
+
+ broker.start();
+ broker.waitUntilStarted();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ broker.stop();
+ }
+
+ @Test
+ public void noMessageLostOnConcurrentScheduling() throws JMSException,
InterruptedException {
+
+ final AtomicLong receiveCounter = new AtomicLong();
+
+ ConnectionFactory cf = new ActiveMQConnectionFactory("vm://localhost");
+ Connection connection = cf.createConnection();
+ connection.start();
+ Session session = connection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+
+ MessageConsumer consumer =
session.createConsumer(session.createQueue(QUEUE_NAME));
+ consumer.setMessageListener(new MessageListener() {
+
+ public void onMessage(Message message) {
+ receiveCounter.incrementAndGet();
+ }
+ });
+
+ List<Sender> senderThreads = new ArrayList<Sender>();
+ for (int i = 0; i < THREAD_COUNT; i++) {
+ Sender sender = new Sender();
+ senderThreads.add(sender);
+ }
+ for (Sender sender : senderThreads) {
+ sender.start();
+ }
+ for (Sender sender : senderThreads) {
+ sender.join();
+ }
+
+ // wait until all scheduled messages has been received
+ TimeUnit.SECONDS.sleep(10);
+
+ session.close();
+ connection.close();
+
+ assertEquals(MESSAGES_PER_THREAD * THREAD_COUNT, receiveCounter.get());
+ }
+
+}
\ No newline at end of file
Propchange:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/bugs/AMQ3140Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/trunk/activemq-core/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/log4j.properties?rev=1068935&r1=1068934&r2=1068935&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/log4j.properties (original)
+++ activemq/trunk/activemq-core/src/test/resources/log4j.properties Wed Feb 9
15:23:38 2011
@@ -5,9 +5,9 @@
## The ASF licenses this file to You under the Apache License, Version 2.0
## (the "License"); you may not use this file except in compliance with
## the License. You may obtain a copy of the License at
-##
+##
## http://www.apache.org/licenses/LICENSE-2.0
-##
+##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
#
log4j.rootLogger=INFO, out, stdout
-log4j.logger.org.apache.activemq.broker.scheduler=DEBUG
+#log4j.logger.org.apache.activemq.broker.scheduler=DEBUG
#log4j.logger.org.apache.activemq.network.DemandForwardingBridgeSupport=DEBUG
#log4j.logger.org.apache.activemq=TRACE
#log4j.logger.org.apache.activemq.store.jdbc=TRACE
