Skip to content

Commit 543fafe

Browse files
Add test when FF is disabled
1 parent 57d37e4 commit 543fafe

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

x-pack/plugin/gpu/src/internalClusterTest/java/org/elasticsearch/plugin/gpu/GPUPluginInitializationIT.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.List;
3030
import java.util.function.Function;
3131

32+
import static org.hamcrest.Matchers.containsString;
3233
import static org.hamcrest.Matchers.equalTo;
3334
import static org.hamcrest.Matchers.startsWith;
3435

@@ -112,6 +113,33 @@ public void testFFOff() {
112113
assertNull(format);
113114
}
114115

116+
public void testFFOffIndexSettingNotSupported() {
117+
assumeFalse("GPU_FORMAT feature flag disabled", GPUPlugin.GPU_FORMAT.isEnabled());
118+
IllegalArgumentException exception = expectThrows(
119+
IllegalArgumentException.class,
120+
() -> createIndex(
121+
"index1",
122+
Settings.builder().put(GPUPlugin.VECTORS_INDEXING_USE_GPU_SETTING.getKey(), GPUPlugin.GpuMode.TRUE).build()
123+
)
124+
);
125+
assertThat(exception.getMessage(), containsString("unknown setting [index.vectors.indexing.use_gpu]"));
126+
}
127+
128+
public void testFFOffGPUFormatNull() {
129+
assumeFalse("GPU_FORMAT feature flag disabled", GPUPlugin.GPU_FORMAT.isEnabled());
130+
TestCuVSServiceProvider.mockedGPUInfoProvider = SUPPORTED_GPU_PROVIDER;
131+
132+
GPUPlugin gpuPlugin = internalCluster().getInstance(GPUPlugin.class);
133+
VectorsFormatProvider vectorsFormatProvider = gpuPlugin.getVectorsFormatProvider();
134+
135+
createIndex("index1", Settings.EMPTY);
136+
IndexSettings settings = getIndexSettings();
137+
final var indexOptions = DenseVectorFieldTypeTests.randomGpuSupportedIndexOptions();
138+
139+
var format = vectorsFormatProvider.getKnnVectorsFormat(settings, indexOptions);
140+
assertNull(format);
141+
}
142+
115143
public void testIndexSettingOnIndexTypeSupportedGPUSupported() {
116144
assumeTrue("GPU_FORMAT feature flag enabled", GPUPlugin.GPU_FORMAT.isEnabled());
117145
TestCuVSServiceProvider.mockedGPUInfoProvider = SUPPORTED_GPU_PROVIDER;

x-pack/plugin/gpu/src/main/java/org/elasticsearch/xpack/gpu/GPUPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public List<Setting<?>> getSettings() {
5454
if (GPU_FORMAT.isEnabled()) {
5555
return List.of(VECTORS_INDEXING_USE_GPU_SETTING);
5656
} else {
57-
return List.of(VECTORS_INDEXING_USE_GPU_SETTING);
57+
return List.of();
5858
}
5959
}
6060

0 commit comments

Comments
 (0)