Repository: activemq Updated Branches: refs/heads/trunk 4705f95be -> 1a0bd45a4
https://issues.apache.org/jira/browse/AMQ-4485 - leveldb version - shows the need to flag async adds so they can get suppressed as duplicates \(and not go to the dlq\) when the cursor order is out of sync on cache full Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/1a0bd45a Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/1a0bd45a Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/1a0bd45a Branch: refs/heads/trunk Commit: 1a0bd45a4e549e74029f7bf7cd2640460544b27c Parents: 4705f95 Author: gtully <gary.tu...@gmail.com> Authored: Fri Oct 17 13:35:31 2014 +0100 Committer: gtully <gary.tu...@gmail.com> Committed: Fri Oct 17 13:35:31 2014 +0100 ---------------------------------------------------------------------- .../org/apache/activemq/leveldb/DBManager.scala | 1 + .../bugs/AMQ4485LowLimitLevelDBTest.java | 38 ++++++++++++++++++++ .../activemq/bugs/AMQ4485LowLimitTest.java | 2 +- 3 files changed, 40 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/1a0bd45a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala index d40d947..09c1378 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala @@ -335,6 +335,7 @@ class DelayableUOW(val manager:DBManager) extends BaseRetained { id.setFutureOrSequenceLong(queueSeq) } else { id.setFutureOrSequenceLong(countDownFuture) + message.setRecievedByDFBridge(true) countDownFuture.id = id } http://git-wip-us.apache.org/repos/asf/activemq/blob/1a0bd45a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitLevelDBTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitLevelDBTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitLevelDBTest.java new file mode 100644 index 0000000..5a48540 --- /dev/null +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitLevelDBTest.java @@ -0,0 +1,38 @@ +/** + * 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 java.io.File; +import org.apache.activemq.broker.BrokerService; +import org.apache.activemq.leveldb.LevelDBStore; + +public class AMQ4485LowLimitLevelDBTest extends AMQ4485LowLimitTest { + + public AMQ4485LowLimitLevelDBTest() { + super(); + numBrokers = 2; + } + + protected BrokerService createBroker(int brokerid, boolean addToNetwork) throws Exception { + BrokerService broker = super.createBroker(brokerid, addToNetwork); + + LevelDBStore levelDBStore = new LevelDBStore(); + levelDBStore.setDirectory(new File(broker.getBrokerDataDirectory(),"levelDB")); + broker.setPersistenceAdapter(levelDBStore); + return broker; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/activemq/blob/1a0bd45a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java index 38c85da..21c389f 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485LowLimitTest.java @@ -64,7 +64,7 @@ public class AMQ4485LowLimitTest extends JmsMultipleBrokersTestSupport { static final String payload = new String(new byte[10 * 1024]); private static final Logger LOG = LoggerFactory.getLogger(AMQ4485LowLimitTest.class); final int portBase = 61600; - final int numBrokers = 8; + int numBrokers = 8; final int numProducers = 30; final int numMessages = 1000; final int consumerSleepTime = 40;
