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

Implements https://issues.apache.org/jira/browse/AMQ-5458 - Also needed to update the slave since it does writes slightly differently.

This commit is contained in:
Hiram Chirino 2014-11-26 08:36:32 -05:00
parent 4141d6a223
commit f4149c0a46
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala
View File

@ -192,7 +192,8 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait {
trace("%s, Slave WAL update: (file:%s, offset: %d, length: %d)".format(directory, value.file.toHexString, value.offset, value.length)) trace("%s, Slave WAL update: (file:%s, offset: %d, length: %d)".format(directory, value.file.toHexString, value.offset, value.length))
val file = client.log.next_log(value.file) val file = client.log.next_log(value.file)
val buffer = map(file, value.offset, value.length, false) val buffer = map(file, value.offset, value.length, false)
session.codec.readData(buffer, ^{
def readData = session.codec.readData(buffer, ^{
if( value.sync ) { if( value.sync ) {
buffer.force() buffer.force()
} }
@ -208,6 +209,15 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait {
send_wal_ack send_wal_ack
} }
}) })
if( client.log.recordLogTestSupport!=null ) {
client.log.recordLogTestSupport.writeCall.call {
readData
}
} else {
readData
}
case LOG_DELETE_ACTION => case LOG_DELETE_ACTION =>
val value = JsonCodec.decode(command.body, classOf[LogDelete]) val value = JsonCodec.decode(command.body, classOf[LogDelete])