Skip to content

Remove min_read_only_index_version from XContent node #119083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 19, 2024
Merged

Remove min_read_only_index_version from XContent node #119083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edf1ae9
Remove min_read_only_index_version from XContent node
tlrx Dec 19, 2024
273f5c0
Merge branch 'main' into 2024/12/19/remove-min-read-only-index-versio…
tlrx Dec 19, 2024
b49e38e
Merge branch 'main' into 2024/12/19/remove-min-read-only-index-versio…
tlrx Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion server/src/main/java/org/elasticsearch/cluster/node/DiscoveryNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
builder.endArray();
builder.field("version", versionInfo.buildVersion().toString());
builder.field("min_index_version", versionInfo.minIndexVersion());
builder.field("min_read_only_index_version", versionInfo.minReadOnlyIndexVersion());
builder.field("max_index_version", versionInfo.maxIndexVersion());
builder.endObject();
return builder;
Expand Down
2 changes: 0 additions & 2 deletions ...test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ public void testToXContentWithDeprecatedClusterState() {
],
"version": "%s",
"min_index_version": %s,
"min_read_only_index_version": %s,
"max_index_version": %s
}
},
Expand Down Expand Up @@ -219,7 +218,6 @@ public void testToXContentWithDeprecatedClusterState() {
clusterState.getNodes().get("node0").getEphemeralId(),
Version.CURRENT,
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
IndexVersion.current(),
IndexVersion.current(),
IndexVersion.current()
Expand Down
6 changes: 0 additions & 6 deletions server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ public void testToXContent() throws IOException {
],
"version": "%s",
"min_index_version":%s,
"min_read_only_index_version":%s,
"max_index_version":%s
}
},
Expand Down Expand Up @@ -390,7 +389,6 @@ public void testToXContent() throws IOException {
ephemeralId,
Version.CURRENT,
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
IndexVersion.current(),
TransportVersion.current(),
IndexVersion.current(),
Expand Down Expand Up @@ -490,7 +488,6 @@ public void testToXContent_FlatSettingTrue_ReduceMappingFalse() throws IOExcepti
],
"version" : "%s",
"min_index_version" : %s,
"min_read_only_index_version" : %s,
"max_index_version" : %s
}
},
Expand Down Expand Up @@ -666,7 +663,6 @@ public void testToXContent_FlatSettingTrue_ReduceMappingFalse() throws IOExcepti
ephemeralId,
Version.CURRENT,
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
IndexVersion.current(),
TransportVersion.current(),
IndexVersion.current(),
Expand Down Expand Up @@ -766,7 +762,6 @@ public void testToXContent_FlatSettingFalse_ReduceMappingTrue() throws IOExcepti
],
"version" : "%s",
"min_index_version" : %s,
"min_read_only_index_version" : %s,
"max_index_version" : %s
}
},
Expand Down Expand Up @@ -948,7 +943,6 @@ public void testToXContent_FlatSettingFalse_ReduceMappingTrue() throws IOExcepti
ephemeralId,
Version.CURRENT,
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
IndexVersion.current(),
TransportVersion.current(),
IndexVersion.current(),
Expand Down
2 changes: 0 additions & 2 deletions server/src/test/java/org/elasticsearch/cluster/node/DiscoveryNodeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,13 @@ public void testDiscoveryNodeToXContent() {
],
"version" : "%s",
"min_index_version" : %s,
"min_read_only_index_version" : %s,
"max_index_version" : %s
}
}""",
transportAddress,
withExternalId ? "test-external-id" : "test-name",
Version.CURRENT,
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
IndexVersion.current()
)
)
Expand Down
2 changes: 0 additions & 2 deletions .../org/elasticsearch/xpack/monitoring/collector/cluster/ClusterStatsMonitoringDocTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,6 @@ public void testToXContent() throws IOException {
pluginEsBuildVersion,
Version.CURRENT,
IndexVersions.MINIMUM_COMPATIBLE,
IndexVersions.MINIMUM_READONLY_COMPATIBLE,
IndexVersion.current(),
apmIndicesExist };
final String expectedJson = """
Expand Down Expand Up @@ -818,7 +817,6 @@ public void testToXContent() throws IOException {
],
"version": "%s",
"min_index_version":%s,
"min_read_only_index_version":%s,
"max_index_version":%s
}
},
Expand Down