Skip to content

Commit

Permalink
fix test setting to lfu
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdconrad
jdconrad committed Jun 24, 2024
1 parent dd9d7fd commit a05ea7c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
1 change: 1 addition & 0 deletions ...est/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceUsingLFUCacheTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1042,6 +1042,7 @@ public void testMaybeFetchRange() throws Exception {
final long regionSize = size(100L);
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lfu")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(cacheSize).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
.put("path.home", createTempDir())
Expand Down
20 changes: 20 additions & 0 deletions ...est/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceUsingLRUCacheTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ private static long size(long numPages) {
public void testBasicEviction() throws IOException {
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -139,6 +140,7 @@ private static boolean tryEvict(SharedBlobCacheService<Object>.CacheFileRegion r
public void testAutoEviction() throws IOException {
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(200)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -183,6 +185,7 @@ public void testAutoEviction() throws IOException {
public void testForceEviction() throws IOException {
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -217,6 +220,7 @@ public void testForceEviction() throws IOException {
public void testForceEvictResponse() throws IOException {
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -263,6 +267,7 @@ public void testGetMultiThreaded() throws IOException {
logger.info("{} {} {}", threads, regionCount, allowAlreadyClosed);
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(regionCount * 100L)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_MIN_TIME_DELTA_SETTING.getKey(), randomFrom("0", "1ms", "10s"))
Expand Down Expand Up @@ -336,6 +341,7 @@ public void testGetMultiThreaded() throws IOException {
public void testFetchFullCacheEntry() throws Exception {
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -395,6 +401,7 @@ public void execute(Runnable command) {
public void testFetchFullCacheEntryConcurrently() throws Exception {
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -452,6 +459,7 @@ public void testCacheSizeRejectedOnNonFrozenNodes() {
? ByteSizeValue.ofBytes(size(500)).getStringRep()
: (new RatioValue(between(1, 100))).formatNoTrailingZerosPercent();
final Settings settings = Settings.builder()
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), cacheSize)
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_HOT_NODE_ROLE.roleName())
Expand All @@ -476,6 +484,7 @@ public void testCacheSizeRejectedOnNonFrozenNodes() {

public void testMultipleDataPathsRejectedOnFrozenNodes() {
final Settings settings = Settings.builder()
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
.putList(Environment.PATH_DATA_SETTING.getKey(), List.of("a", "b"))
Expand All @@ -500,6 +509,7 @@ public void testMultipleDataPathsRejectedOnFrozenNodes() {

public void testDedicateFrozenCacheSizeDefaults() {
final Settings settings = Settings.builder()
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
.build();

Expand All @@ -512,6 +522,7 @@ public void testDedicateFrozenCacheSizeDefaults() {

public void testNotDedicatedFrozenCacheSizeDefaults() {
final Settings settings = Settings.builder()
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.putList(
NodeRoleSettings.NODE_ROLES_SETTING.getKey(),
Sets.union(
Expand Down Expand Up @@ -544,6 +555,7 @@ public void testNotDedicatedFrozenCacheSizeDefaults() {

public void testSearchOrIndexNodeCacheSizeDefaults() {
final Settings settings = Settings.builder()
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.putList(
NodeRoleSettings.NODE_ROLES_SETTING.getKey(),
randomFrom(DiscoveryNodeRole.SEARCH_ROLE, DiscoveryNodeRole.INDEX_ROLE).roleName()
Expand All @@ -560,6 +572,7 @@ public void testSearchOrIndexNodeCacheSizeDefaults() {
public void testMaxHeadroomRejectedForAbsoluteCacheSize() {
String cacheSize = ByteSizeValue.ofBytes(size(500)).getStringRep();
final Settings settings = Settings.builder()
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), cacheSize)
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_MAX_HEADROOM_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
Expand Down Expand Up @@ -589,6 +602,7 @@ public void testCalculateCacheSize() {
long largeSize = ByteSizeValue.ofTb(10).getBytes();
assertThat(SharedBlobCacheService.calculateCacheSize(Settings.EMPTY, smallSize), equalTo(0L));
final Settings settings = Settings.builder()
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
.build();
assertThat(SharedBlobCacheService.calculateCacheSize(settings, smallSize), equalTo(9000L));
Expand All @@ -603,6 +617,7 @@ public void testCacheSizeChanges() throws IOException {
ByteSizeValue val1 = new ByteSizeValue(randomIntBetween(1, 5), ByteSizeUnit.MB);
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), val1.getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -645,6 +660,7 @@ public void testMaybeEvictRecentUsed() throws Exception {
final long regionSize = size(1L);
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(numRegions)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -691,6 +707,7 @@ public void testMaybeFetchRegion() throws Exception {
final long regionSize = size(100L);
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(cacheSize).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -790,6 +807,7 @@ public void testPopulate() throws Exception {
final long regionSize = size(1L);
Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
.put("path.home", createTempDir())
Expand Down Expand Up @@ -855,6 +873,7 @@ public void testPopulate() throws Exception {
private void assertThatNonPositiveRecoveryRangeSizeRejected(Setting<ByteSizeValue> setting) {
final String value = randomFrom(ByteSizeValue.MINUS_ONE, ByteSizeValue.ZERO).getStringRep();
final Settings settings = Settings.builder()
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
.put(setting.getKey(), value)
Expand Down Expand Up @@ -883,6 +902,7 @@ public void testUseFullRegionSize() throws IOException {

Settings settings = Settings.builder()
.put(NODE_NAME_SETTING.getKey(), "node")
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(cacheSize).getStringRep())
.put("path.home", createTempDir())
Expand Down

0 comments on commit a05ea7c

Please sign in to comment.