Skip to content

Commit 0c43ff9

Browse files
masseykeywangd
authored andcommitted
Re-enabling BWC tests, and updating supported versions for shard count feature after backport (elastic#75789)
1 parent 5499267 commit 0c43ff9

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,9 @@ tasks.register("verifyVersions") {
145145
* after the backport of the backcompat code is complete.
146146
*/
147147

148-
boolean bwc_tests_enabled = false
148+
boolean bwc_tests_enabled = true
149149
// place a PR link here when committing bwc changes:
150-
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/75760"
150+
String bwc_tests_disabled_issue = ""
151151
/*
152152
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
153153
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/nodes.stats/11_indices_metrics.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@
324324
"Metric - blank for indices shards":
325325
- skip:
326326
features: [arbitrary_key]
327-
version: " - 7.99.99"
328-
reason: "total shard count added in version 8.0"
327+
version: " - 7.14.99"
328+
reason: "total shard count added in version 7.15.0"
329329
- do:
330330
nodes.info: {}
331331
- set:
@@ -341,8 +341,8 @@
341341
"Metric - _all for indices shards":
342342
- skip:
343343
features: [arbitrary_key]
344-
version: " - 7.99.99"
345-
reason: "total shard count added in version 8.0"
344+
version: " - 7.14.99"
345+
reason: "total shard count added in version 7.15.0"
346346
- do:
347347
nodes.info: {}
348348
- set:
@@ -360,8 +360,8 @@
360360

361361
- skip:
362362
features: ["allowed_warnings", arbitrary_key]
363-
version: " - 7.99.99"
364-
reason: "total shard count added in version 8.0"
363+
version: " - 7.14.99"
364+
reason: "total shard count added in version 7.15.0"
365365

366366
- do:
367367
indices.create:

server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStats.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@ public CommonStats(StreamInput in) throws IOException {
257257
recoveryStats = in.readOptionalWriteable(RecoveryStats::new);
258258
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
259259
bulk = in.readOptionalWriteable(BulkStats::new);
260+
}
261+
if (in.getVersion().onOrAfter(Version.V_7_15_0)) {
260262
shards = in.readOptionalWriteable(ShardCountStats::new);
261263
}
262264
}
@@ -281,6 +283,8 @@ public void writeTo(StreamOutput out) throws IOException {
281283
out.writeOptionalWriteable(recoveryStats);
282284
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
283285
out.writeOptionalWriteable(bulk);
286+
}
287+
if (out.getVersion().onOrAfter(Version.V_7_15_0)) {
284288
out.writeOptionalWriteable(shards);
285289
}
286290
}

0 commit comments

Comments
 (0)