Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for AMQ-4296: Don't GC past LevelDB records pointed to by prepared XA transactions. 

Also avoid double logging a LOG_ADD_ENTRY.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1483530 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2013-05-16 19:34:48 +00:00
parent e40d280115
commit b5505d462d
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/DBManager.scala
View File

@ -792,6 +792,7 @@ class DBManager(val parent:LevelDBStore) {
var sub = DurableSubscription(key, sr.getTopicKey, info)
sub.lastAckPosition = client.getAckPosition(key);
sub.gcPosition = sub.lastAckPosition
parent.createSubscription(sub)
case TRANSACTION_COLLECTION_TYPE =>
val meta = record.getMeta

5
activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala
View File

@ -1297,10 +1297,7 @@ class LevelDBClient(store: LevelDBStore) {
index_record.setValueLength(dataLocator.len)
batch.put(key, encodeEntryRecord(index_record.freeze()).toByteArray)
val log_data = encodeEntryRecord(log_record.freeze())
val index_data = encodeEntryRecord(index_record.freeze()).toByteArray
appender.append(LOG_ADD_ENTRY, log_data)
batch.put(key, index_data)
for (key <- logRefKey(dataLocator.pos, log_info)) {
@ -1322,7 +1319,7 @@ class LevelDBClient(store: LevelDBStore) {
throw new RuntimeException("Unexpected locator type")
}
}
println(dataLocator)
// println(dataLocator)
val el = ack.getLastMessageId.getEntryLocator.asInstanceOf[EntryLocator];
val os = new DataByteArrayOutputStream()

8
activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBStore.scala
View File

@ -76,6 +76,7 @@ object LevelDBStore extends Log {
}
case class DurableSubscription(subKey:Long, topicKey:Long, info: SubscriptionInfo) {
var gcPosition = 0L
var lastAckPosition = 0L
var cursorPosition = 0L
}
@ -381,6 +382,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P
def commit(uow:DelayableUOW) = {
store.doUpdateAckPosition(uow, sub, position)
sub.gcPosition = position
}
def prepare(uow:DelayableUOW) = {
prev_position = sub.lastAckPosition
@ -756,8 +758,8 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P
var pos = lastSeq.get()
subscriptions.synchronized {
subscriptions.values.foreach { sub =>
if( sub.lastAckPosition < pos ) {
pos = sub.lastAckPosition
if( sub.gcPosition < pos ) {
pos = sub.gcPosition
}
}
if( firstSeq != pos+1) {
@ -775,6 +777,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P
subscriptions.put((info.getClientId, info.getSubcriptionName), sub)
}
sub.lastAckPosition = if (retroactive) 0 else lastSeq.get()
sub.gcPosition = sub.lastAckPosition
waitOn(withUow{ uow=>
uow.updateAckPosition(sub.subKey, sub.lastAckPosition)
uow.countDownFuture
@ -801,6 +804,7 @@ class LevelDBStore extends LockableServiceSupport with BrokerServiceAware with P
def doUpdateAckPosition(uow: DelayableUOW, sub: DurableSubscription, position: Long) = {
sub.lastAckPosition = position
sub.gcPosition = position
uow.updateAckPosition(sub.subKey, sub.lastAckPosition)
}