Skip to content

Commit db65d61

Browse files
committed
Update index deprecation checks to return minimum writable index version for use with ignore setting
1 parent 3b6522b commit db65d61

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ static DeprecationIssue oldIndicesCheck(DataStream dataStream, ClusterState clus
3838
false,
3939
ofEntries(
4040
entry("reindex_required", true),
41+
entry("minimum_writable_version_after_upgrade", DeprecatedIndexPredicate.MINIMUM_WRITEABLE_VERSION_AFTER_UPGRADE.id()),
4142
entry("total_backing_indices", backingIndices.size()),
4243
entry("indices_requiring_upgrade_count", indicesNeedingUpgrade.size()),
4344
entry("indices_requiring_upgrade", indicesNeedingUpgrade)

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020
import org.elasticsearch.xpack.core.deprecation.DeprecationIssue;
2121

2222
import java.util.ArrayList;
23-
import java.util.Collections;
2423
import java.util.List;
2524
import java.util.Locale;
2625
import java.util.Map;
2726
import java.util.function.BiConsumer;
2827
import java.util.function.BiFunction;
2928
import java.util.function.Function;
3029

30+
import static java.util.Map.entry;
31+
import static java.util.Map.ofEntries;
32+
3133
/**
3234
* Index-specific deprecation checks
3335
*/
@@ -44,7 +46,10 @@ static DeprecationIssue oldIndicesCheck(IndexMetadata indexMetadata, ClusterStat
4446
"https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-9.0.html",
4547
"This index has version: " + currentCompatibilityVersion.toReleaseVersion(),
4648
false,
47-
Collections.singletonMap("reindex_required", true)
49+
ofEntries(
50+
entry("reindex_required", true),
51+
entry("minimum_writable_version_after_upgrade", DeprecatedIndexPredicate.MINIMUM_WRITEABLE_VERSION_AFTER_UPGRADE.id())
52+
)
4853
);
4954
}
5055
return null;

0 commit comments

Comments
 (0)