PR Changes

Author: lukewhiting

x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DataStreamDeprecationChecks.java

@@ -24,12 +24,12 @@ public class DataStreamDeprecationChecks {
     static DeprecationIssue oldIndicesCheck(DataStream dataStream, ClusterState clusterState) {
         List<Index> backingIndices = dataStream.getIndices();
 
-        Set<String> indiciesNeedingUpgrade = backingIndices.stream()
-            .filter(index -> clusterState.metadata().index(index).getCompatibilityVersion().before(IndexVersions.V_8_0_0))
+        Set<String> indicesNeedingUpgrade = backingIndices.stream()
+            .filter(index -> clusterState.metadata().index(index).getCreationVersion().onOrBefore(IndexVersions.UPGRADE_TO_LUCENE_10_0_0))
             .map(Index::getName)
             .collect(Collectors.toUnmodifiableSet());
 
-        if (indiciesNeedingUpgrade.isEmpty() == false) {
+        if (indicesNeedingUpgrade.isEmpty() == false) {
             return new DeprecationIssue(
                 DeprecationIssue.Level.CRITICAL,
                 "Old data stream with a compatibility version < 8.0",
@@ -38,9 +38,9 @@ static DeprecationIssue oldIndicesCheck(DataStream dataStream, ClusterState clus
                 false,
                 ofEntries(
                     entry("reindex_required", true),
-                    entry("total_backing_indicies", backingIndices.size()),
-                    entry("indicies_requiring_upgrade_count", indiciesNeedingUpgrade.size()),
-                    entry("indicies_requiring_upgrade", indiciesNeedingUpgrade)
+                    entry("total_backing_indices", backingIndices.size()),
+                    entry("indices_requiring_upgrade_count", indicesNeedingUpgrade.size()),
+                    entry("indices_requiring_upgrade", indicesNeedingUpgrade)
                 )
             );
         }

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/DataStreamDeprecationChecksTests.java

@@ -91,10 +91,10 @@ public void testOldIndicesCheck() {
             false,
             ofEntries(
                 entry("reindex_required", true),
-                entry("total_backing_indicies", oldIndexCount + newIndexCount),
-                entry("indicies_requiring_upgrade_count", oldIndexCount),
+                entry("total_backing_indices", oldIndexCount + newIndexCount),
+                entry("indices_requiring_upgrade_count", oldIndexCount),
                 entry(
-                    "indicies_requiring_upgrade",
+                    "indices_requiring_upgrade",
                     nameToIndexMetadata.keySet()
                         .stream()
                         .filter(name -> name.startsWith("old-data-stream-index-"))