cleanup commit

Signed-off-by: Peter Alfonsi <[email protected]>
peteralfonsi · Jan 2, 2024 · ad25390 · ad25390
1 parent 8831632
commit ad25390
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 127 deletions.
diff --git a/...er/src/internalClusterTest/java/org/opensearch/indices/IndicesRequestCacheDiskTierIT.java b/...er/src/internalClusterTest/java/org/opensearch/indices/IndicesRequestCacheDiskTierIT.java
diff --git a/server/src/main/java/org/opensearch/common/cache/tier/EhCacheDiskCachingTier.java b/server/src/main/java/org/opensearch/common/cache/tier/EhCacheDiskCachingTier.java
@@ -246,13 +246,13 @@ public TierType getTierType() {
 
     @Override
     public void close() {
-        cacheManager.removeCache(DISK_CACHE_ALIAS);
-        cacheManager.close();
         try {
             cacheManager.destroyCache(DISK_CACHE_ALIAS);
+            cacheManager.close();
+            cacheManager = null;
         } catch (CachePersistenceException e) {
             throw new OpenSearchException("Exception occurred while destroying ehcache and associated data", e);
-        }
+        } catch (NullPointerException ignored) {} // Another test node has already destroyed the cache manager
     }
 
     /**

diff --git a/server/src/main/java/org/opensearch/common/cache/tier/OnHeapTierRequestStats.java b/server/src/main/java/org/opensearch/common/cache/tier/OnHeapTierRequestStats.java
diff --git a/server/src/test/java/org/opensearch/indices/IndicesRequestCacheTests.java b/server/src/test/java/org/opensearch/indices/IndicesRequestCacheTests.java
@@ -250,8 +250,7 @@ public void testEviction() throws Exception {
         }
         IndicesRequestCache cache = new IndicesRequestCache(
             Settings.builder().put(IndicesRequestCache.INDICES_CACHE_QUERY_SIZE.getKey(), size.getBytes() + 1 + "b").build(),
-            getInstanceFromNode(IndicesService.class),
-            dummyClusterSettings
+            getInstanceFromNode(IndicesService.class)
         );
         AtomicBoolean indexShard = new AtomicBoolean(true);
         ShardRequestCache requestCacheStats = new ShardRequestCache();