Skip to content

Fix Searchable Snapshot Test Range Size Overflow #74113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2021
Merged

Fix Searchable Snapshot Test Range Size Overflow #74113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions ...java/org/elasticsearch/xpack/searchablesnapshots/AbstractSearchableSnapshotsTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@

import static com.carrotsearch.randomizedtesting.RandomizedTest.randomAsciiLettersOfLengthBetween;
import static org.elasticsearch.xpack.searchablesnapshots.cache.common.TestUtils.randomPopulateAndReads;
import static org.elasticsearch.xpack.searchablesnapshots.cache.shared.SharedBytes.PAGE_SIZE;
import static org.elasticsearch.xpack.searchablesnapshots.cache.shared.SharedBytes.pageAligned;

public abstract class AbstractSearchableSnapshotsTestCase extends ESIndexInputTestCase {
Expand Down Expand Up @@ -211,25 +212,20 @@ protected static ByteSizeValue randomFrozenCacheSize() {
* @return a random {@link ByteSizeValue} that can be used to set {@link CacheService#SNAPSHOT_CACHE_RANGE_SIZE_SETTING}
*/
protected static ByteSizeValue randomCacheRangeSize() {
return pageAligned(
new ByteSizeValue(
randomLongBetween(
CacheService.MIN_SNAPSHOT_CACHE_RANGE_SIZE.getBytes(),
CacheService.MAX_SNAPSHOT_CACHE_RANGE_SIZE.getBytes()
)
)
);
return pageAlignedBetween(CacheService.MIN_SNAPSHOT_CACHE_RANGE_SIZE, CacheService.MAX_SNAPSHOT_CACHE_RANGE_SIZE);
}

protected static ByteSizeValue randomFrozenCacheRangeSize() {
return pageAligned(
new ByteSizeValue(
randomLongBetween(
FrozenCacheService.MIN_SNAPSHOT_CACHE_RANGE_SIZE.getBytes(),
FrozenCacheService.MAX_SNAPSHOT_CACHE_RANGE_SIZE.getBytes()
)
)
);
return pageAlignedBetween(FrozenCacheService.MIN_SNAPSHOT_CACHE_RANGE_SIZE, FrozenCacheService.MAX_SNAPSHOT_CACHE_RANGE_SIZE);
}

private static ByteSizeValue pageAlignedBetween(ByteSizeValue min, ByteSizeValue max) {
ByteSizeValue aligned = pageAligned(new ByteSizeValue(randomLongBetween(min.getBytes(), max.getBytes())));
if (aligned.compareTo(max) > 0) {
// minus one page in case page alignment moved us past the max setting value
return new ByteSizeValue(aligned.getBytes() - PAGE_SIZE);
}
return aligned;
}

protected static SearchableSnapshotRecoveryState createRecoveryState(boolean finalizedDone) {
Expand Down