From dea38e62f893a3ef3aa7cc21b87aef357f6fcae2 Mon Sep 17 00:00:00 2001 From: Hiram Chirino Date: Fri, 1 Nov 2013 14:17:40 -0400 Subject: [PATCH] leveldb replication: Lets always download the current append log just to be safe --- .../leveldb/replicated/SlaveLevelDBStore.scala | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala index f1a47f7152..7befe9db04 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala @@ -332,20 +332,11 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait { if (stashed_file.length() == x.length ) return stashed_file.cached_crc32 == x.crc32 - if ( stashed_file.crc32(x.length) == x.crc32 ) { - // we don't want to truncate the log file currently being appended to. - if( x.file != state.append_log ) { - // Our log file might be longer. lets truncate to match. - val raf = new RandomAccessFile(stashed_file, "rw") - try { - raf.setLength(x.length) - } finally { - raf.close(); - } - } - return true; + if( x.file == state.append_log ) { + return false; } - return false + + return stashed_file.cached_crc32 == x.crc32 } // We don't have to transfer log files that have been previously transferred.