Merge branch '3.1' into 3.2

neo4j · Feb 15, 2017 · b797487 · b797487
2 parents 18b74da + d5da197
commit b797487
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/...ty/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/FailureStorage.java b/...ty/lucene-index/src/main/java/org/neo4j/kernel/api/impl/index/storage/FailureStorage.java
@@ -115,6 +115,10 @@ public synchronized void storeIndexFailure( String failure ) throws IOException
         File failureFile = failureFile();
         try ( StoreChannel channel = fs.open( failureFile, "rw" ) )
         {
+            byte[] existingData = new byte[(int) channel.size()];
+            channel.read( ByteBuffer.wrap( existingData ) );
+            channel.position( lengthOf( existingData ) );
+
             byte[] data = UTF8.encode( failure );
             channel.write( ByteBuffer.wrap( data, 0, Math.min( data.length, MAX_FAILURE_SIZE ) ) );
 
@@ -135,7 +139,6 @@ private String readFailure( File failureFile ) throws IOException
         {
             byte[] data = new byte[(int) channel.size()];
             int readData = channel.read( ByteBuffer.wrap( data ) );
-            channel.close();
             return readData <= 0 ? "" : UTF8.decode( withoutZeros( data ) );
         }
     }
@@ -149,7 +152,7 @@ private static byte[] withoutZeros( byte[] data )
 
     private static int lengthOf( byte[] data )
     {
-        for (int i = 0; i < data.length; i++ )
+        for ( int i = 0; i < data.length; i++ )
         {
             if ( 0 == data[i] )
             {

diff --git a/...ucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java b/...ucene-index/src/test/java/org/neo4j/kernel/api/impl/index/storage/FailureStorageTest.java
@@ -28,9 +28,12 @@
 import org.neo4j.kernel.api.impl.index.storage.layout.IndexFolderLayout;
 import org.neo4j.test.rule.fs.EphemeralFileSystemRule;
 
+import static org.hamcrest.CoreMatchers.containsString;
+
 import static java.lang.String.format;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class FailureStorageTest
@@ -99,4 +102,23 @@ public void shouldClearFailure() throws Exception
         // THEN
         assertFalse( fs.get().fileExists( failureFile ) );
     }
+
+    @Test
+    public void shouldAppendFailureIfAlreadyExists() throws Exception
+    {
+        // GIVEN
+        FailureStorage storage = new FailureStorage( fs.get(), indexFolderLayout );
+        storage.reserveForIndex();
+        String failure1 = "Once upon a time there was a first failure";
+        String failure2 = "Then there was another";
+        storage.storeIndexFailure( failure1 );
+
+        // WHEN
+        storage.storeIndexFailure( failure2 );
+
+        // THEN
+        String allFailures = storage.loadIndexFailure();
+        assertThat( allFailures, containsString( failure1 ) );
+        assertThat( allFailures, containsString( failure2 ) );
+    }
 }