From e6e27457aa07d9d6f31b4b6207ee2b3b371a50dc Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Tue, 24 Mar 2020 09:55:10 +0100 Subject: [PATCH] reenable BWC after backport --- build.gradle | 4 ++-- .../elasticsearch/xpack/core/indexing/IndexerJobStats.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 792672d6021ff..a23614bafa975 100644 --- a/build.gradle +++ b/build.gradle @@ -222,8 +222,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/54027" /* 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/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java index 57aac7f839e4b..927c71ce8e10c 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/IndexerJobStats.java @@ -73,7 +73,7 @@ public IndexerJobStats(StreamInput in) throws IOException { this.indexFailures = in.readVLong(); this.searchFailures = in.readVLong(); - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo V_7_7_0 + if (in.getVersion().onOrAfter(Version.V_7_7_0)) { this.processingTime = in.readVLong(); this.processingTotal = in.readVLong(); } @@ -194,7 +194,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeVLong(searchTotal); out.writeVLong(indexFailures); out.writeVLong(searchFailures); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { + if (out.getVersion().onOrAfter(Version.V_7_7_0)) { out.writeVLong(processingTime); out.writeVLong(processingTotal); }