svn commit: r1489019 - in /activemq/trunk: activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala

[ch...@apache.org]

Author: chirino
Date: Mon Jun  3 14:55:57 2013
New Revision: 1489019

URL: http://svn.apache.org/r1489019
Log:
Try to avoid the 'short record at position' LevelDB error reported at: http://activemq.2283324.n4.nabble.com/Activemq-5-9-leveldb-replication-issue-tp4667495p4667674.html

Added:
    activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java
Modified:
    activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala

Added: activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java?rev=1489019&view=auto
==============================================================================
--- activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java (added)
+++ activemq/trunk/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/IDERunner.java Mon Jun  3 14:55:57 2013
@@ -0,0 +1,36 @@
+/**
+ * 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.transport.amqp;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.leveldb.LevelDBStore;
+
+import java.io.File;
+
+public class IDERunner {
+
+    public static void main(String[]args) throws Exception {
+        BrokerService bs = new BrokerService();
+        bs.addConnector("tcp://localhost:61616");
+        LevelDBStore store = new LevelDBStore();
+        store.setDirectory(new File("target/activemq-data/haleveldb"));
+        bs.setPersistenceAdapter(store);
+        bs.deleteAllMessages();
+        bs.start();
+        bs.waitUntilStopped();
+    }
+}

Modified: activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala?rev=1489019&r1=1489018&r2=1489019&view=diff
==============================================================================
--- activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala (original)
+++ activemq/trunk/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala Mon Jun  3 14:55:57 2013
@@ -283,8 +283,17 @@ case class RecordLog(directory: File, lo
         data
       } else {
         val data = new Buffer(length)
-        if( channel.read(data.toByteBuffer, offset+LOG_HEADER_SIZE) != data.length ) {
-          throw new IOException("short record at position: "+record_position+" in file: "+file+", offset: "+offset)
+        var bb = data.toByteBuffer
+        var position = offset+LOG_HEADER_SIZE
+        while( bb.hasRemaining  ) {
+          var count = channel.read(bb, position)
+          if( count == 0 ) {
+            throw new IOException("zero read at file '%s' offset: %d".format(file, position))
+          }
+          if( count < 0 ) {
+            throw new EOFException("File '%s' offset: %d".format(file, position))
+          }
+          position += count
         }
         data
       }