From d686863b5357a6d7db09fdc039930778c2f2154a Mon Sep 17 00:00:00 2001 From: David Roberts Date: Wed, 25 Sep 2019 12:09:45 +0100 Subject: [PATCH] Remove fallback for controller location This change removes the temporary controller location fallback introduced in #47013. Relates elastic/ml-cpp#593 --- .../org/elasticsearch/bootstrap/Spawner.java | 8 ++------ .../org/elasticsearch/plugins/Platforms.java | 19 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java b/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java index 8337500f73aae..f1c6c36dc5cca 100644 --- a/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java +++ b/server/src/main/java/org/elasticsearch/bootstrap/Spawner.java @@ -72,13 +72,9 @@ void spawnNativeControllers(final Environment environment) throws IOException { List paths = PluginsService.findPluginDirs(environment.modulesFile()); for (final Path modules : paths) { final PluginInfo info = PluginInfo.readFromProperties(modules); - Path spawnPath = Platforms.nativeControllerPath(modules); + final Path spawnPath = Platforms.nativeControllerPath(modules); if (!Files.isRegularFile(spawnPath)) { - // TODO: remove before release and just continue if the controller is not in the standard place - spawnPath = Platforms.fallbackNativeControllerPath(modules); - if (spawnPath == null || Files.isRegularFile(spawnPath) == false) { - continue; - } + continue; } if (!info.hasNativeController()) { final String message = String.format( diff --git a/server/src/main/java/org/elasticsearch/plugins/Platforms.java b/server/src/main/java/org/elasticsearch/plugins/Platforms.java index 8a374701b6e29..57186acceeed6 100644 --- a/server/src/main/java/org/elasticsearch/plugins/Platforms.java +++ b/server/src/main/java/org/elasticsearch/plugins/Platforms.java @@ -54,25 +54,6 @@ public static Path nativeControllerPath(Path plugin) { .resolve(PROGRAM_NAME); } - /** - * The fallback path to the native controller for a plugin with native - * components to be used if no program is found using the standard path. - * This is a temporary measure to allow developers not working on this - * functionality to continue to work with C++ bundles from before or - * after the change. This code should never be in a supported release. - * TODO: remove this method before release - */ - public static Path fallbackNativeControllerPath(Path plugin) { - if (Constants.MAC_OS_X) { - return plugin - .resolve("platform") - .resolve(PLATFORM_NAME) - .resolve("bin") - .resolve(PROGRAM_NAME); - } - return null; - } - /** * Return the platform name based on the OS name and architecture, for example: * - darwin-x86_64