Hide overflow protection behind setting

Signed-off-by: Finn Carroll <[email protected]>
finnegancarroll · Aug 14, 2024 · 6d2f104 · 6d2f104
1 parent 400802a
commit 6d2f104
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/index/store/remote/filecache/FileCache.java b/server/src/main/java/org/opensearch/index/store/remote/filecache/FileCache.java
@@ -53,7 +53,7 @@ public class FileCache implements RefCountedCache<Path, CachedIndexInput> {
     private final SegmentedCache<Path, CachedIndexInput> theCache;
 
     private final CircuitBreaker circuitBreaker;
-    private boolean allowOverflow = true;
+    private boolean enableOverflow = true;
 
     public FileCache(SegmentedCache<Path, CachedIndexInput> cache, CircuitBreaker circuitBreaker) {
         this.theCache = cache;
@@ -64,6 +64,14 @@ public long capacity() {
         return theCache.capacity();
     }
 
+    public void enableOverflow(boolean enable) {
+        this.enableOverflow = enable;
+    }
+
+    public boolean canOverflow() {
+        return enableOverflow;
+    }
+
     @Override
     public CachedIndexInput put(Path filePath, CachedIndexInput indexInput) {
         CachedIndexInput cachedIndexInput = theCache.put(filePath, indexInput);

diff --git a/server/src/main/java/org/opensearch/index/store/remote/utils/TransferManager.java b/server/src/main/java/org/opensearch/index/store/remote/utils/TransferManager.java
@@ -98,7 +98,7 @@ private static FileCachedIndexInput createIndexInput(FileCache fileCache, Stream
         try {
             // This local file cache is ref counted and may not strictly enforce configured capacity.
             // If we find available capacity is exceeded, deny further BlobFetchRequests.
-            if (fileCache.capacity() < fileCache.usage().usage() + request.getBlobLength()) {
+            if (fileCache.capacity() < fileCache.usage().usage() + request.getBlobLength() && !fileCache.canOverflow()) {
                 throw new IOException("Local file cache capacity exceeded - BlobFetchRequest failed: " + request.getFilePath());
             }
             if (Files.exists(request.getFilePath()) == false) {

diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
@@ -2083,7 +2083,7 @@ private void initializeFileCache(Settings settings, CircuitBreaker circuitBreake
         fileCacheNodePath.fileCacheReservedSize = new ByteSizeValue(this.fileCache.capacity(), ByteSizeUnit.BYTES);
         List<Path> fileCacheDataPaths = collectFileCacheDataPath(fileCacheNodePath);
         this.fileCache.restoreFromDirectory(fileCacheDataPaths);
-//        this.fileCache.overflowEnabled(NODE_SEARCH_CACHE_SIZE_SETTING.get(settings));
+        this.fileCache.enableOverflow(NODE_SEARCH_CACHE_OVERFLOW_SETTING.get(settings));
     }
 
     private static long calculateFileCacheSize(String capacityRaw, long totalSpace) {