Skip to content

Commit

Permalink
Re-enabling BWC tests, and updating supported versions for shard coun…
Browse files Browse the repository at this point in the history
…t feature after backport (#75789)
  • Loading branch information
masseyke authored Jul 28, 2021
1 parent fb0846a commit 0790107
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ tasks.register("verifyVersions") {
* after the backport of the backcompat code is complete.
*/

boolean bwc_tests_enabled = false
boolean bwc_tests_enabled = true
// place a PR link here when committing bwc changes:
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/75760"
String bwc_tests_disabled_issue = ""
/*
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@
"Metric - blank for indices shards":
- skip:
features: [arbitrary_key]
version: " - 7.99.99"
reason: "total shard count added in version 8.0"
version: " - 7.14.99"
reason: "total shard count added in version 7.15.0"
- do:
nodes.info: {}
- set:
Expand All @@ -341,8 +341,8 @@
"Metric - _all for indices shards":
- skip:
features: [arbitrary_key]
version: " - 7.99.99"
reason: "total shard count added in version 8.0"
version: " - 7.14.99"
reason: "total shard count added in version 7.15.0"
- do:
nodes.info: {}
- set:
Expand All @@ -360,8 +360,8 @@

- skip:
features: ["allowed_warnings", arbitrary_key]
version: " - 7.99.99"
reason: "total shard count added in version 8.0"
version: " - 7.14.99"
reason: "total shard count added in version 7.15.0"

- do:
indices.create:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,8 @@ public CommonStats(StreamInput in) throws IOException {
recoveryStats = in.readOptionalWriteable(RecoveryStats::new);
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
bulk = in.readOptionalWriteable(BulkStats::new);
}
if (in.getVersion().onOrAfter(Version.V_7_15_0)) {
shards = in.readOptionalWriteable(ShardCountStats::new);
}
}
Expand All @@ -281,6 +283,8 @@ public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalWriteable(recoveryStats);
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
out.writeOptionalWriteable(bulk);
}
if (out.getVersion().onOrAfter(Version.V_7_15_0)) {
out.writeOptionalWriteable(shards);
}
}
Expand Down

0 comments on commit 0790107

Please sign in to comment.