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

Fix part size calculation if all parts are of the same size 

Relates to #13574
This commit is contained in:
Simon Willnauer 2015-09-30 21:29:00 +02:00
parent 97db3d5ef6
commit 5915309939
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java
View File

@ -163,7 +163,7 @@ public class BlobStoreIndexShardSnapshot implements ToXContent, FromXContentBuil
return partBytes;
}
// Last part size is deducted from the length and the number of parts
return length() % partBytes;
return length() - (partBytes * (numberOfParts-1));
}
/**

29
core/src/test/java/org/elasticsearch/index/snapshots/blobstore/FileInfoTests.java
View File

@ -83,7 +83,7 @@ public class FileInfoTests extends ESTestCase {
String name = "foobar";
String physicalName = "_foobar";
String failure = null;
long length = Math.max(0,Math.abs(randomLong()));
long length = Math.max(0, Math.abs(randomLong()));
// random corruption
switch (randomIntBetween(0, 3)) {
case 0:
@ -137,4 +137,31 @@ public class FileInfoTests extends ESTestCase {
}
}
}
public void testGetPartSize() {
BlobStoreIndexShardSnapshot.FileInfo info = new BlobStoreIndexShardSnapshot.FileInfo("foo", new StoreFileMetaData("foo", 36), new ByteSizeValue(6));
int numBytes = 0;
for (int i = 0; i < info.numberOfParts(); i++) {
numBytes += info.partBytes(i);
}
assertEquals(numBytes, 36);
info = new BlobStoreIndexShardSnapshot.FileInfo("foo", new StoreFileMetaData("foo", 35), new ByteSizeValue(6));
numBytes = 0;
for (int i = 0; i < info.numberOfParts(); i++) {
numBytes += info.partBytes(i);
}
assertEquals(numBytes, 35);
final int numIters = randomIntBetween(10, 100);
for (int j = 0; j < numIters; j++) {
StoreFileMetaData metaData = new StoreFileMetaData("foo", randomIntBetween(0, 1000));
info = new BlobStoreIndexShardSnapshot.FileInfo("foo", metaData, new ByteSizeValue(randomIntBetween(1, 1000)));
numBytes = 0;
for (int i = 0; i < info.numberOfParts(); i++) {
numBytes += info.partBytes(i);
}
assertEquals(numBytes, metaData.length());
}
}
}