From 813d8e1f7e1eb94aff5d03272fd1d2c1bb0060a1 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Tue, 13 Feb 2018 11:43:34 +0100 Subject: [PATCH] Fix meta plugin installation that contains plugins with dependencies When installing a meta plugin we check the dependency of each sub plugin during the installation. Though if the extended plugin is part of the meta plugin the installation fails because we only check for plugins that are already installed. This change is a workaround that extracts all plugins (even those that are not fully installed yet) when the dependency check is made during the installation. Note that this is how the plugin installation worked before https://github.com/elastic/elasticsearch/pull/28581. --- .../main/java/org/elasticsearch/plugins/PluginsService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/plugins/PluginsService.java b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java index 3b4c8757b48..c3d1a450a11 100644 --- a/server/src/main/java/org/elasticsearch/plugins/PluginsService.java +++ b/server/src/main/java/org/elasticsearch/plugins/PluginsService.java @@ -293,8 +293,7 @@ public class PluginsService extends AbstractComponent { try (DirectoryStream stream = Files.newDirectoryStream(rootPath)) { for (Path plugin : stream) { if (FileSystemUtils.isDesktopServicesStore(plugin) || - plugin.getFileName().toString().startsWith(".removing-") || - plugin.getFileName().toString().startsWith(".installing-")) { + plugin.getFileName().toString().startsWith(".removing-")) { continue; } if (seen.add(plugin.getFileName().toString()) == false) {