Skip to content

Commit e036ac4

Browse files
author
David Roberts
authored
Remove fallback for controller location (#47104)
This change removes the temporary controller location fallback introduced in #47013. Relates elastic/ml-cpp#593
1 parent 3a7ad13 commit e036ac4

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

server/src/main/java/org/elasticsearch/bootstrap/Spawner.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,9 @@ void spawnNativeControllers(final Environment environment) throws IOException {
7272
List<Path> paths = PluginsService.findPluginDirs(environment.modulesFile());
7373
for (final Path modules : paths) {
7474
final PluginInfo info = PluginInfo.readFromProperties(modules);
75-
Path spawnPath = Platforms.nativeControllerPath(modules);
75+
final Path spawnPath = Platforms.nativeControllerPath(modules);
7676
if (!Files.isRegularFile(spawnPath)) {
77-
// TODO: remove before release and just continue if the controller is not in the standard place
78-
spawnPath = Platforms.fallbackNativeControllerPath(modules);
79-
if (spawnPath == null || Files.isRegularFile(spawnPath) == false) {
80-
continue;
81-
}
77+
continue;
8278
}
8379
if (!info.hasNativeController()) {
8480
final String message = String.format(

server/src/main/java/org/elasticsearch/plugins/Platforms.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,6 @@ public static Path nativeControllerPath(Path plugin) {
5454
.resolve(PROGRAM_NAME);
5555
}
5656

57-
/**
58-
* The fallback path to the native controller for a plugin with native
59-
* components to be used if no program is found using the standard path.
60-
* This is a temporary measure to allow developers not working on this
61-
* functionality to continue to work with C++ bundles from before or
62-
* after the change. This code should never be in a supported release.
63-
* TODO: remove this method before release
64-
*/
65-
public static Path fallbackNativeControllerPath(Path plugin) {
66-
if (Constants.MAC_OS_X) {
67-
return plugin
68-
.resolve("platform")
69-
.resolve(PLATFORM_NAME)
70-
.resolve("bin")
71-
.resolve(PROGRAM_NAME);
72-
}
73-
return null;
74-
}
75-
7657
/**
7758
* Return the platform name based on the OS name and architecture, for example:
7859
* - darwin-x86_64

0 commit comments

Comments
 (0)