honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

On recovery (startup), the recovery translog file handle is not properly closed, closes #1866.

This commit is contained in:
Shay Banon 2012-04-17 12:14:24 +03:00
parent 79309ae7e3
commit 20e968bf62
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/elasticsearch/index/gateway/local/LocalIndexShardGateway.java
View File

@ -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 class LocalIndexShardGateway extends AbstractIndexShardComponent implemen
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 class LocalIndexShardGateway extends AbstractIndexShardComponent implemen
// 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);