Skip to content

Temp cuvs load fixes #132928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Temp cuvs load fixes #132928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions libs/native/src/main/java/org/elasticsearch/nativeaccess/NativeAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@

package org.elasticsearch.nativeaccess;

import org.elasticsearch.logging.LogManager;

import java.lang.foreign.Arena;
import java.lang.foreign.SymbolLookup;
import java.nio.file.Path;
import java.util.Optional;
import java.util.OptionalLong;
Expand All @@ -18,6 +22,11 @@
*/
public interface NativeAccess {

static void loadCuvs() {
var libCuvs = SymbolLookup.libraryLookup(System.mapLibraryName("cuvs_c"), Arena.ofAuto());
LogManager.getLogger(NativeAccess.class).info("Loaded libcuvs_c.so: " + libCuvs);
Copy link
Contributor

@ChrisHegarty ChrisHegarty Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This solely for logging / debugging purposes, right? And if cuVS is not present then null or something is printed? (which is fine)

Copy link
Contributor Author

@ldematte ldematte Aug 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep!

}

/**
* Get the one and only instance of {@link NativeAccess} which is specific to the running platform and JVM.
*/
Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ private static void initPhase2(Bootstrap bootstrap) throws IOException {
bootstrap.spawner().spawnNativeControllers(nodeEnv);

nodeEnv.validateNativesConfig(); // temporary directories are important for JNA
NativeAccess.loadCuvs();
initializeNatives(
nodeEnv.tmpDir(),
BootstrapSettings.MEMORY_LOCK_SETTING.get(args.nodeSettings()),
Expand Down
1 change: 1 addition & 0 deletions ...lugin/gpu/src/yamlRestTest/java/org/elasticsearch/xpack/gpu/GPUClientYamlTestSuiteIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class GPUClientYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
.module("gpu")
.setting("xpack.license.self_generated.type", "trial")
.setting("xpack.security.enabled", "false")
.environment("LD_LIBRARY_PATH", System.getenv("LD_LIBRARY_PATH"))
.build();

public GPUClientYamlTestSuiteIT(final ClientYamlTestCandidate testCandidate) {
Expand Down