Skip to content

Remove fallback for controller location #47104

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

Merged
merged 2 commits into from
Oct 4, 2019
Merged

Remove fallback for controller location #47104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d686863
Remove fallback for controller location
Sep 25, 2019
dc7f149
Merge branch 'master' into remove_controller_location_leniency
Oct 1, 2019
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
8 changes: 2 additions & 6 deletions server/src/main/java/org/elasticsearch/bootstrap/Spawner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,9 @@ void spawnNativeControllers(final Environment environment) throws IOException {
List<Path> 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(
Expand Down
19 changes: 0 additions & 19 deletions server/src/main/java/org/elasticsearch/plugins/Platforms.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down