honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-24 17:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

properly handle failures by closing file refs

Browse Source
This commit is contained in:
kimchy 2010-04-04 02:45:41 +03:00
parent 3e7bf0fa20
commit 4692ef805b
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/elasticsearch/src/main/java/org/elasticsearch/index/gateway/fs/FsIndexShardGateway.java
View File

@ -124,17 +124,25 @@ public class FsIndexShardGateway extends AbstractIndexShardComponent implements
latch.countDown();
continue;
}
IndexInput indexInput = null;
try {
IndexInput indexInput = snapshotIndexCommit.getDirectory().openInput(fileName);
indexInput = snapshotIndexCommit.getDirectory().openInput(fileName);
File snapshotFile = new File(locationIndex, fileName);
if (snapshotFile.exists() && (snapshotFile.length() == indexInput.length())) {
// we assume its the same one, no need to copy
latch.countDown();
continue;
}
indexInput.close();
} catch (Exception e) {
logger.debug("Failed to verify file equality based on length, copying...", e);
} finally {
if (indexInput != null) {
try {
indexInput.close();
} catch (IOException e) {
// ignore
}
}
}
threadPool.execute(new Runnable() {
@Override public void run() {
@ -230,12 +238,12 @@ public class FsIndexShardGateway extends AbstractIndexShardComponent implements
syncFile(translogFile);
}
} catch (Exception e) {
try {
if (translogRaf != null) {
if (translogRaf != null) {
try {
translogRaf.close();
} catch (Exception e1) {
// ignore
}
} catch (Exception e1) {
// ignore
}
throw new IndexShardGatewaySnapshotFailedException(shardId(), "Failed to finalize snapshot into [" + translogFile + "]", e);
}
@ -343,12 +351,16 @@ public class FsIndexShardGateway extends AbstractIndexShardComponent implements
return name.startsWith("translog-");
}
});
if (files == null) {
return -1;
}
long index = -1;
for (File file : files) {
String name = file.getName();
RandomAccessFile raf = null;
try {
RandomAccessFile raf = new RandomAccessFile(file, "r");
raf = new RandomAccessFile(file, "r");
// if header is -1, then its not properly written, ignore it
if (raf.readInt() == -1) {
continue;
@ -356,6 +368,12 @@ public class FsIndexShardGateway extends AbstractIndexShardComponent implements
} catch (Exception e) {
// broken file, continue
continue;
} finally {
try {
raf.close();
} catch (IOException e) {
// ignore
}
}
long fileIndex = Long.parseLong(name.substring(name.indexOf('-') + 1));
if (fileIndex >= index) {