Remove maximum_number_trees from mappings

elastic · Mar 10, 2020 · e46e008 · e46e008
1 parent 6ec6316
commit e46e008
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...plugin/core/src/main/resources/org/elasticsearch/xpack/core/ml/config_index_mappings.json b/...plugin/core/src/main/resources/org/elasticsearch/xpack/core/ml/config_index_mappings.json
@@ -40,9 +40,6 @@
               "lambda" : {
                 "type" : "double"
               },
-              "maximum_number_trees" : {
-                "type" : "integer"
-              },
               "max_trees" : {
                 "type" : "integer"
               },
@@ -90,9 +87,6 @@
               "lambda" : {
                 "type" : "double"
               },
-              "maximum_number_trees" : {
-                "type" : "integer"
-              },
               "max_trees" : {
                 "type" : "integer"
               },

diff --git a/.../test/java/org/elasticsearch/xpack/restart/MlConfigIndexMappingsFullClusterRestartIT.java b/.../test/java/org/elasticsearch/xpack/restart/MlConfigIndexMappingsFullClusterRestartIT.java
@@ -77,7 +77,16 @@ public void testMlConfigIndexMappingsAfterMigration() throws Exception {
             // trigger .ml-config index mappings update
             createAnomalyDetectorJob(NEW_CLUSTER_JOB_ID);
             // assert that the mappings are updated
-            assertThat(getConfigIndexMappings(), equalTo(expectedConfigIndexMappings));
+            Map<String, Object> configIndexMappings = getConfigIndexMappings();
+
+            // Remove renamed fields
+            if (getOldClusterVersion().onOrAfter(Version.V_7_7_0)) {
+                configIndexMappings = XContentMapValues.filter(expectedConfigIndexMappings, null, new String[] {
+                    "analysis.properties.*.properties.maximum_number_trees" // This was renamed to max_trees
+                });
+            }
+
+            assertThat(configIndexMappings, equalTo(expectedConfigIndexMappings));
         }
     }