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

[SNAPSHOT] Minor code cleanup

This commit is contained in:
Simon Willnauer 2014-09-17 19:12:53 +02:00
parent 63eb49d202
commit 19c969a800
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardRepository.java
View File

@ -486,11 +486,9 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
// snapshotStatus.startTime() is assigned on the same machine, so it's safe to use with VLong // snapshotStatus.startTime() is assigned on the same machine, so it's safe to use with VLong
System.currentTimeMillis() - snapshotStatus.startTime(), indexNumberOfFiles, indexTotalFilesSize); System.currentTimeMillis() - snapshotStatus.startTime(), indexNumberOfFiles, indexTotalFilesSize);
//TODO: The time stored in snapshot doesn't include cleanup time. //TODO: The time stored in snapshot doesn't include cleanup time.
try { logger.trace("[{}] [{}] writing shard snapshot file", shardId, snapshotId);
logger.trace("[{}] [{}] writing shard snapshot file", shardId, snapshotId); try (OutputStream output = blobContainer.createOutput(commitPointName)) {
try (OutputStream output = blobContainer.createOutput(commitPointName)) { writeSnapshot(snapshot, output);
writeSnapshot(snapshot, output);
}
} catch (IOException e) { } catch (IOException e) {
throw new IndexShardSnapshotFailedException(shardId, "Failed to write commit point", e); throw new IndexShardSnapshotFailedException(shardId, "Failed to write commit point", e);
} }
@ -520,6 +518,7 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
*/ */
private void snapshotFile(final BlobStoreIndexShardSnapshot.FileInfo fileInfo) throws IOException { private void snapshotFile(final BlobStoreIndexShardSnapshot.FileInfo fileInfo) throws IOException {
final String file = fileInfo.physicalName(); final String file = fileInfo.physicalName();
final byte[] buffer = new byte[BUFFER_SIZE];
try (IndexInput indexInput = store.openVerifyingInput(file, IOContext.READONCE, fileInfo.metadata())) { try (IndexInput indexInput = store.openVerifyingInput(file, IOContext.READONCE, fileInfo.metadata())) {
for (int i = 0; i < fileInfo.numberOfParts(); i++) { for (int i = 0; i < fileInfo.numberOfParts(); i++) {
final InputStreamIndexInput inputStreamIndexInput = new InputStreamIndexInput(indexInput, fileInfo.partBytes()); final InputStreamIndexInput inputStreamIndexInput = new InputStreamIndexInput(indexInput, fileInfo.partBytes());
@ -527,7 +526,6 @@ public class BlobStoreIndexShardRepository extends AbstractComponent implements
inputStream = new AbortableInputStream(inputStream, fileInfo.physicalName()); inputStream = new AbortableInputStream(inputStream, fileInfo.physicalName());
try (OutputStream output = blobContainer.createOutput(fileInfo.partName(i))) { try (OutputStream output = blobContainer.createOutput(fileInfo.partName(i))) {
int len; int len;
final byte[] buffer = new byte[BUFFER_SIZE];
while ((len = inputStream.read(buffer)) > 0) { while ((len = inputStream.read(buffer)) > 0) {
output.write(buffer, 0, len); output.write(buffer, 0, len);
} }