Skip to content

Commit a05ea7c

Browse files
jdconradjdconrad
committed
fix test setting to lfu
1 parent dd9d7fd commit a05ea7c

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

‎x-pack/plugin/blob-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceUsingLFUCacheTests.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,7 @@ public void testMaybeFetchRange() throws Exception {
10421042
final long regionSize = size(100L);
10431043
Settings settings = Settings.builder()
10441044
.put(NODE_NAME_SETTING.getKey(), "node")
1045+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lfu")
10451046
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(cacheSize).getStringRep())
10461047
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
10471048
.put("path.home", createTempDir())

‎x-pack/plugin/blob-cache/src/test/java/org/elasticsearch/blobcache/shared/SharedBlobCacheServiceUsingLRUCacheTests.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ private static long size(long numPages) {
6161
public void testBasicEviction() throws IOException {
6262
Settings settings = Settings.builder()
6363
.put(NODE_NAME_SETTING.getKey(), "node")
64+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
6465
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
6566
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
6667
.put("path.home", createTempDir())
@@ -139,6 +140,7 @@ private static boolean tryEvict(SharedBlobCacheService<Object>.CacheFileRegion r
139140
public void testAutoEviction() throws IOException {
140141
Settings settings = Settings.builder()
141142
.put(NODE_NAME_SETTING.getKey(), "node")
143+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
142144
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(200)).getStringRep())
143145
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
144146
.put("path.home", createTempDir())
@@ -183,6 +185,7 @@ public void testAutoEviction() throws IOException {
183185
public void testForceEviction() throws IOException {
184186
Settings settings = Settings.builder()
185187
.put(NODE_NAME_SETTING.getKey(), "node")
188+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
186189
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
187190
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
188191
.put("path.home", createTempDir())
@@ -217,6 +220,7 @@ public void testForceEviction() throws IOException {
217220
public void testForceEvictResponse() throws IOException {
218221
Settings settings = Settings.builder()
219222
.put(NODE_NAME_SETTING.getKey(), "node")
223+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
220224
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
221225
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
222226
.put("path.home", createTempDir())
@@ -263,6 +267,7 @@ public void testGetMultiThreaded() throws IOException {
263267
logger.info("{} {} {}", threads, regionCount, allowAlreadyClosed);
264268
Settings settings = Settings.builder()
265269
.put(NODE_NAME_SETTING.getKey(), "node")
270+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
266271
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(regionCount * 100L)).getStringRep())
267272
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
268273
.put(SharedBlobCacheService.SHARED_CACHE_MIN_TIME_DELTA_SETTING.getKey(), randomFrom("0", "1ms", "10s"))
@@ -336,6 +341,7 @@ public void testGetMultiThreaded() throws IOException {
336341
public void testFetchFullCacheEntry() throws Exception {
337342
Settings settings = Settings.builder()
338343
.put(NODE_NAME_SETTING.getKey(), "node")
344+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
339345
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
340346
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
341347
.put("path.home", createTempDir())
@@ -395,6 +401,7 @@ public void execute(Runnable command) {
395401
public void testFetchFullCacheEntryConcurrently() throws Exception {
396402
Settings settings = Settings.builder()
397403
.put(NODE_NAME_SETTING.getKey(), "node")
404+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
398405
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(500)).getStringRep())
399406
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
400407
.put("path.home", createTempDir())
@@ -452,6 +459,7 @@ public void testCacheSizeRejectedOnNonFrozenNodes() {
452459
? ByteSizeValue.ofBytes(size(500)).getStringRep()
453460
: (new RatioValue(between(1, 100))).formatNoTrailingZerosPercent();
454461
final Settings settings = Settings.builder()
462+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
455463
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), cacheSize)
456464
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
457465
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_HOT_NODE_ROLE.roleName())
@@ -476,6 +484,7 @@ public void testCacheSizeRejectedOnNonFrozenNodes() {
476484

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

501510
public void testDedicateFrozenCacheSizeDefaults() {
502511
final Settings settings = Settings.builder()
512+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
503513
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
504514
.build();
505515

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

513523
public void testNotDedicatedFrozenCacheSizeDefaults() {
514524
final Settings settings = Settings.builder()
525+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
515526
.putList(
516527
NodeRoleSettings.NODE_ROLES_SETTING.getKey(),
517528
Sets.union(
@@ -544,6 +555,7 @@ public void testNotDedicatedFrozenCacheSizeDefaults() {
544555

545556
public void testSearchOrIndexNodeCacheSizeDefaults() {
546557
final Settings settings = Settings.builder()
558+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
547559
.putList(
548560
NodeRoleSettings.NODE_ROLES_SETTING.getKey(),
549561
randomFrom(DiscoveryNodeRole.SEARCH_ROLE, DiscoveryNodeRole.INDEX_ROLE).roleName()
@@ -560,6 +572,7 @@ public void testSearchOrIndexNodeCacheSizeDefaults() {
560572
public void testMaxHeadroomRejectedForAbsoluteCacheSize() {
561573
String cacheSize = ByteSizeValue.ofBytes(size(500)).getStringRep();
562574
final Settings settings = Settings.builder()
575+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
563576
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), cacheSize)
564577
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_MAX_HEADROOM_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
565578
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
@@ -589,6 +602,7 @@ public void testCalculateCacheSize() {
589602
long largeSize = ByteSizeValue.ofTb(10).getBytes();
590603
assertThat(SharedBlobCacheService.calculateCacheSize(Settings.EMPTY, smallSize), equalTo(0L));
591604
final Settings settings = Settings.builder()
605+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
592606
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
593607
.build();
594608
assertThat(SharedBlobCacheService.calculateCacheSize(settings, smallSize), equalTo(9000L));
@@ -603,6 +617,7 @@ public void testCacheSizeChanges() throws IOException {
603617
ByteSizeValue val1 = new ByteSizeValue(randomIntBetween(1, 5), ByteSizeUnit.MB);
604618
Settings settings = Settings.builder()
605619
.put(NODE_NAME_SETTING.getKey(), "node")
620+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
606621
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), val1.getStringRep())
607622
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
608623
.put("path.home", createTempDir())
@@ -645,6 +660,7 @@ public void testMaybeEvictRecentUsed() throws Exception {
645660
final long regionSize = size(1L);
646661
Settings settings = Settings.builder()
647662
.put(NODE_NAME_SETTING.getKey(), "node")
663+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
648664
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(numRegions)).getStringRep())
649665
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
650666
.put("path.home", createTempDir())
@@ -691,6 +707,7 @@ public void testMaybeFetchRegion() throws Exception {
691707
final long regionSize = size(100L);
692708
Settings settings = Settings.builder()
693709
.put(NODE_NAME_SETTING.getKey(), "node")
710+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
694711
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(cacheSize).getStringRep())
695712
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
696713
.put("path.home", createTempDir())
@@ -790,6 +807,7 @@ public void testPopulate() throws Exception {
790807
final long regionSize = size(1L);
791808
Settings settings = Settings.builder()
792809
.put(NODE_NAME_SETTING.getKey(), "node")
810+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
793811
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
794812
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
795813
.put("path.home", createTempDir())
@@ -855,6 +873,7 @@ public void testPopulate() throws Exception {
855873
private void assertThatNonPositiveRecoveryRangeSizeRejected(Setting<ByteSizeValue> setting) {
856874
final String value = randomFrom(ByteSizeValue.MINUS_ONE, ByteSizeValue.ZERO).getStringRep();
857875
final Settings settings = Settings.builder()
876+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
858877
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(size(100)).getStringRep())
859878
.putList(NodeRoleSettings.NODE_ROLES_SETTING.getKey(), DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE.roleName())
860879
.put(setting.getKey(), value)
@@ -883,6 +902,7 @@ public void testUseFullRegionSize() throws IOException {
883902

884903
Settings settings = Settings.builder()
885904
.put(NODE_NAME_SETTING.getKey(), "node")
905+
.put(SharedBlobCacheService.SHARED_CACHE_TYPE.getKey(), "lru")
886906
.put(SharedBlobCacheService.SHARED_CACHE_REGION_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(regionSize).getStringRep())
887907
.put(SharedBlobCacheService.SHARED_CACHE_SIZE_SETTING.getKey(), ByteSizeValue.ofBytes(cacheSize).getStringRep())
888908
.put("path.home", createTempDir())

0 commit comments

Comments
 (0)