Commit 8ec3fff
committed
Fail fast when k-NN plugin is missing
vectorSearch() currently lets queries proceed even when the k-NN plugin
is not installed; the user sees a cryptic native OpenSearch error deep
in execution. This change adds a lazy capability probe that runs on the
first vectorSearch() invocation per JVM and throws a clear message when
the plugin is absent.
- KnnPluginCapability: probes Nodes Info once via NodeClient, caches the
result. Successful results (positive or negative) are cached; probe
failures (IO, timeout) are not, so subsequent calls retry. If no
NodeClient is available (REST-client / standalone mode), the check is
skipped and execution-time errors remain the signal.
- The probe uses the canonical k-NN plugin class name rather than the
artifact name so it survives repackaging variants.
- Wired into VectorSearchTableFunctionImplementation.applyArguments() so
the failure surfaces before any DSL is built. Resolver instantiates
one shared capability per registration; the constructor remains
backward-compatible (two-arg form delegates to the three-arg form).
- Unit tests cover: node-client absent (skip), plugin present (pass),
plugin absent (throw), positive/negative caching, and probe-failure
non-caching.
Plugin registration stays unconditional — failing at registration would
break introspection (SHOW FUNCTIONS etc.) on clusters without k-NN.
Signed-off-by: Eric Wei <mengwei.eric@gmail.com>1 parent 129bf10 commit 8ec3fff
5 files changed
Lines changed: 279 additions & 10 deletions
File tree
- opensearch/src
- main/java/org/opensearch/sql/opensearch/storage
- capability
- test/java/org/opensearch/sql/opensearch/storage
- capability
Lines changed: 6 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| |||
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
| 51 | + | |
50 | 52 | | |
51 | 53 | | |
52 | 54 | | |
53 | 55 | | |
54 | 56 | | |
55 | | - | |
| 57 | + | |
| 58 | + | |
56 | 59 | | |
57 | 60 | | |
58 | 61 | | |
59 | 62 | | |
60 | 63 | | |
| 64 | + | |
61 | 65 | | |
62 | 66 | | |
63 | 67 | | |
| |||
89 | 93 | | |
90 | 94 | | |
91 | 95 | | |
| 96 | + | |
92 | 97 | | |
93 | 98 | | |
94 | 99 | | |
| |||
Lines changed: 14 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
| |||
17 | 16 | | |
18 | 17 | | |
19 | 18 | | |
| 19 | + | |
20 | 20 | | |
21 | | - | |
22 | 21 | | |
23 | 22 | | |
24 | 23 | | |
| |||
30 | 29 | | |
31 | 30 | | |
32 | 31 | | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
33 | 44 | | |
34 | 45 | | |
35 | 46 | | |
| |||
40 | 51 | | |
41 | 52 | | |
42 | 53 | | |
43 | | - | |
| 54 | + | |
44 | 55 | | |
45 | 56 | | |
46 | 57 | | |
| |||
opensearch/src/main/java/org/opensearch/sql/opensearch/storage/capability/KnnPluginCapability.java
Lines changed: 90 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
Lines changed: 40 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
| |||
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
34 | 40 | | |
35 | 41 | | |
36 | 42 | | |
| |||
61 | 67 | | |
62 | 68 | | |
63 | 69 | | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
64 | 92 | | |
65 | 93 | | |
66 | 94 | | |
| |||
183 | 211 | | |
184 | 212 | | |
185 | 213 | | |
186 | | - | |
| 214 | + | |
| 215 | + | |
187 | 216 | | |
188 | 217 | | |
189 | 218 | | |
| |||
297 | 326 | | |
298 | 327 | | |
299 | 328 | | |
300 | | - | |
| 329 | + | |
| 330 | + | |
301 | 331 | | |
302 | 332 | | |
303 | 333 | | |
| |||
313 | 343 | | |
314 | 344 | | |
315 | 345 | | |
316 | | - | |
| 346 | + | |
| 347 | + | |
317 | 348 | | |
318 | 349 | | |
319 | 350 | | |
| |||
383 | 414 | | |
384 | 415 | | |
385 | 416 | | |
386 | | - | |
| 417 | + | |
| 418 | + | |
387 | 419 | | |
388 | 420 | | |
389 | 421 | | |
| |||
398 | 430 | | |
399 | 431 | | |
400 | 432 | | |
401 | | - | |
| 433 | + | |
| 434 | + | |
402 | 435 | | |
403 | 436 | | |
404 | 437 | | |
| |||
440 | 473 | | |
441 | 474 | | |
442 | 475 | | |
443 | | - | |
| 476 | + | |
| 477 | + | |
444 | 478 | | |
445 | 479 | | |
0 commit comments