diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/SearchableSnapshotDirectory.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/SearchableSnapshotDirectory.java index d62443e492605..22a00bee481e8 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/SearchableSnapshotDirectory.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/SearchableSnapshotDirectory.java @@ -494,7 +494,7 @@ private void prewarmCache(ActionListener listener, Supplier cance } recoveryState.getIndex().addFileDetail(file.physicalName(), file.length(), false); try { - final IndexInput input = openInput(file.physicalName(), CachedBlobContainerIndexInput.CACHE_WARMING_CONTEXT); + final IndexInput input = openInput(file.physicalName(), IOContext.DEFAULT); assert input instanceof CachedBlobContainerIndexInput : "expected cached index input but got " + input.getClass(); CachedBlobContainerIndexInput cachedIndexInput = (CachedBlobContainerIndexInput) input; diff --git a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/CachedBlobContainerIndexInput.java b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/CachedBlobContainerIndexInput.java index 4711043fff281..e129d7c0efb81 100644 --- a/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/CachedBlobContainerIndexInput.java +++ b/x-pack/plugin/searchable-snapshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/store/input/CachedBlobContainerIndexInput.java @@ -10,7 +10,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.lucene.store.IOContext; -import org.apache.lucene.store.ReadAdvice; import org.elasticsearch.blobcache.BlobCacheUtils; import org.elasticsearch.blobcache.common.ByteRange; import org.elasticsearch.index.snapshots.blobstore.BlobStoreIndexShardSnapshot.FileInfo; @@ -31,13 +30,6 @@ public class CachedBlobContainerIndexInput extends MetadataCachingIndexInput { - /** - * Specific IOContext used for prewarming the cache. This context allows to write - * a complete part of the {@link #fileInfo} at once in the cache and should not be - * used for anything else than what the {@link #prefetchPart(int, Supplier)} method does. - */ - public static final IOContext CACHE_WARMING_CONTEXT = new IOContext(IOContext.Context.DEFAULT, null, null, ReadAdvice.NORMAL); - private static final Logger logger = LogManager.getLogger(CachedBlobContainerIndexInput.class); public CachedBlobContainerIndexInput( @@ -102,7 +94,6 @@ private CachedBlobContainerIndexInput( @Override protected void readWithoutBlobCache(ByteBuffer b) throws Exception { - ensureContext(ctx -> ctx != CACHE_WARMING_CONTEXT); final long position = getAbsolutePosition(); final int length = b.remaining(); @@ -139,7 +130,6 @@ public long getPersistentCacheInitialLength() throws Exception { * or {@code -1} if the prewarming was cancelled */ public long prefetchPart(final int part, Supplier isCancelled) throws IOException { - ensureContext(ctx -> ctx == CACHE_WARMING_CONTEXT); if (part >= fileInfo.numberOfParts()) { throw new IllegalArgumentException("Unexpected part number [" + part + "]"); }