From 81340046a72f72df7d0381cf414d94e954a5490a Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Fri, 12 Jul 2019 12:10:37 +0200 Subject: [PATCH] Enable BwC Tests after #43148 Backport * #43148 has been backported to `7.4` -> we can reenable these tests after adjusting the version in teh serialization logic --- build.gradle | 4 ++-- .../action/admin/cluster/snapshots/status/SnapshotStatus.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 4f42a0eac4197..5c1fe80668283 100644 --- a/build.gradle +++ b/build.gradle @@ -160,8 +160,8 @@ task verifyVersions { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = false -final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/44261" /* place a PR link here when committing bwc changes */ +boolean bwc_tests_enabled = true +final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ if (bwc_tests_enabled == false) { if (bwc_tests_disabled_issue.isEmpty()) { throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false") diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java index 613887274b3ca..566b5d93b9b23 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotStatus.java @@ -172,7 +172,7 @@ public void readFrom(StreamInput in) throws IOException { includeGlobalState = in.readOptionalBoolean(); final long startTime; final long time; - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { + if (in.getVersion().onOrAfter(Version.V_7_4_0)) { startTime = in.readLong(); time = in.readLong(); } else { @@ -191,7 +191,7 @@ public void writeTo(StreamOutput out) throws IOException { shard.writeTo(out); } out.writeOptionalBoolean(includeGlobalState); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getVersion().onOrAfter(Version.V_7_4_0)) { out.writeLong(stats.getStartTime()); out.writeLong(stats.getTime()); }