Deprecation check for File Discovery plugin (#36190)

Adds a deprecation warning that the file discovery plugin is no longer needed and that the path it uses has changed.
elastic · Dec 7, 2018 · ea2d9b1 · ea2d9b1
1 parent 0a4f203
commit ea2d9b1
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/...ugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java b/...ugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java
@@ -39,7 +39,8 @@ private DeprecationChecks() {
     static List<BiFunction<List<NodeInfo>, List<NodeStats>, DeprecationIssue>> NODE_SETTINGS_CHECKS =
         Collections.unmodifiableList(Arrays.asList(
             NodeDeprecationChecks::azureRepositoryChanges,
-            NodeDeprecationChecks::gcsRepositoryChanges
+            NodeDeprecationChecks::gcsRepositoryChanges,
+            NodeDeprecationChecks::fileDiscoveryPluginRemoved
         ));
 
     static List<Function<IndexMetaData, DeprecationIssue>> INDEX_SETTINGS_CHECKS =

diff --git a/.../deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java b/.../deprecation/src/main/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecks.java
@@ -49,4 +49,20 @@ static DeprecationIssue gcsRepositoryChanges(List<NodeInfo> nodeInfos, List<Node
         }
         return null;
     }
+
+    static DeprecationIssue fileDiscoveryPluginRemoved(List<NodeInfo> nodeInfos, List<NodeStats> nodeStats) {
+        List<String> nodesFound = nodeInfos.stream()
+            .filter(nodeInfo ->
+                nodeInfo.getPlugins().getPluginInfos().stream()
+                    .anyMatch(pluginInfo -> "discovery-file".equals(pluginInfo.getName()))
+            ).map(nodeInfo -> nodeInfo.getNode().getName()).collect(Collectors.toList());
+        if (nodesFound.size() > 0) {
+            return new DeprecationIssue(DeprecationIssue.Level.WARNING,
+                "File-based discovery is no longer a plugin and uses a different path",
+                "https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking_70_cluster_changes.html" +
+                    "#_file_based_discovery_plugin",
+                "nodes with discovery-file installed: " + nodesFound);
+        }
+        return null;
+    }
 }
diff --git a/...ecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java b/...ecation/src/test/java/org/elasticsearch/xpack/deprecation/NodeDeprecationChecksTests.java
@@ -88,4 +88,19 @@ public void testGCSPluginCheck() {
             "nodes with repository-gcs installed: [node_check]");
         assertSettingsAndIssue("foo", "bar", expected);
     }
+
+    public void testFileDiscoveryPluginCheck() {
+        Version esVersion = VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, Version.CURRENT);
+        PluginInfo deprecatedPlugin = new PluginInfo(
+            "discovery-file", "dummy plugin description", "dummy_plugin_version", esVersion,
+            "javaVersion", "DummyPluginName", Collections.emptyList(), false);
+        pluginsAndModules = new PluginsAndModules(Collections.singletonList(deprecatedPlugin), Collections.emptyList());
+
+        DeprecationIssue expected = new DeprecationIssue(DeprecationIssue.Level.WARNING,
+            "File-based discovery is no longer a plugin and uses a different path",
+            "https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking_70_cluster_changes.html" +
+                "#_file_based_discovery_plugin",
+            "nodes with discovery-file installed: [node_check]");
+        assertSettingsAndIssue("foo", "bar", expected);
+    }
 }