On recovery (startup), the recovery translog file handle is not prope…

…rly closed, closes elastic#1866.
racker · Apr 17, 2012 · 66454c1 · 66454c1
1 parent 78858f4
commit 66454c1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java b/src/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.index.gateway.local;
 
+import com.google.common.io.Closeables;
 import org.apache.lucene.index.IndexReader;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.InputStreamStreamInput;
@@ -178,8 +179,10 @@ public void recover(boolean indexShouldExists, RecoveryStatus recoveryStatus) th
 
         recoveryStatus.translog().startTime(System.currentTimeMillis());
         recoveryStatus.updateStage(RecoveryStatus.Stage.TRANSLOG);
+        FileInputStream fs = null;
         try {
-            InputStreamStreamInput si = new InputStreamStreamInput(new FileInputStream(recoveringTranslogFile));
+            fs = new FileInputStream(recoveringTranslogFile);
+            InputStreamStreamInput si = new InputStreamStreamInput(fs);
             while (true) {
                 Translog.Operation operation;
                 try {
@@ -199,6 +202,8 @@ public void recover(boolean indexShouldExists, RecoveryStatus recoveryStatus) th
             // we failed to recovery, make sure to delete the translog file (and keep the recovering one)
             indexShard.translog().close(true);
             throw new IndexShardGatewayRecoveryException(shardId, "failed to recover shard", e);
+        } finally {
+            Closeables.closeQuietly(fs);
         }
         indexShard.performRecoveryFinalization(true);