Skip to content

Commit 28e2f16

Browse files
authored
Prepare backport of #51260. (#51876)
Backport: #51875
1 parent 2b8e0f6 commit 28e2f16

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ task verifyVersions {
215215
* after the backport of the backcompat code is complete.
216216
*/
217217

218-
boolean bwc_tests_enabled = true
219-
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
218+
boolean bwc_tests_enabled = false
219+
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/51875" /* place a PR link here when committing bwc changes */
220220
if (bwc_tests_enabled == false) {
221221
if (bwc_tests_disabled_issue.isEmpty()) {
222222
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

modules/analysis-common/src/test/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"get cluster stats returns analysis stats":
33

44
- skip:
5-
version: " - 7.99.99" # TODO: 7.6.99
5+
version: " - 7.6.99"
66
reason: "analysis stats are added for v7.7.0"
77

88
- do:

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.stats/10_basic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"get cluster stats returns mapping stats":
8989

9090
- skip:
91-
version: " - 7.99.99" # TODO: 7.6.99
91+
version: " - 7.6.99"
9292
reason: "mapping stats are added for v7.7.0"
9393

9494
- do:

server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public ClusterStatsResponse(StreamInput in) throws IOException {
5353
String clusterUUID = null;
5454
MappingStats mappingStats = null;
5555
AnalysisStats analysisStats = null;
56-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // TODO: 7_7_0
56+
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
5757
clusterUUID = in.readOptionalString();
5858
mappingStats = in.readOptionalWriteable(MappingStats::new);
5959
analysisStats = in.readOptionalWriteable(AnalysisStats::new);
@@ -112,7 +112,7 @@ public void writeTo(StreamOutput out) throws IOException {
112112
super.writeTo(out);
113113
out.writeVLong(timestamp);
114114
out.writeOptionalWriteable(status);
115-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
115+
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
116116
out.writeOptionalString(clusterUUID);
117117
out.writeOptionalWriteable(indicesStats.getMappings());
118118
out.writeOptionalWriteable(indicesStats.getAnalysis());

0 commit comments

Comments
 (0)