From c80505f339e964b82c97aedee4b0701980e423c4 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Mon, 8 Feb 2021 17:20:42 +0100 Subject: [PATCH 1/2] backport: set version to 7.12 --- .../xpack/core/transform/transforms/TransformConfig.java | 4 ++-- .../core/transform/transforms/TransformConfigUpdate.java | 4 ++-- .../core/transform/transforms/TransformIndexerStats.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java index 2187d2537864a..04b5f8755576e 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfig.java @@ -227,7 +227,7 @@ public TransformConfig(final StreamInput in) throws IOException { } else { settings = new SettingsConfig(); } - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0 + if (in.getVersion().onOrAfter(Version.V_7_12_0)) { retentionPolicyConfig = in.readOptionalNamedWriteable(RetentionPolicyConfig.class); } else { retentionPolicyConfig = null; @@ -366,7 +366,7 @@ public void writeTo(final StreamOutput out) throws IOException { if (out.getVersion().onOrAfter(Version.V_7_8_0)) { settings.writeTo(out); } - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0 + if (out.getVersion().onOrAfter(Version.V_7_12_0)) { out.writeOptionalNamedWriteable(retentionPolicyConfig); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java index 0ab6e9cd1f2f9..157f00463720d 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformConfigUpdate.java @@ -122,7 +122,7 @@ public TransformConfigUpdate(final StreamInput in) throws IOException { } else { settings = null; } - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0 + if (in.getVersion().onOrAfter(Version.V_7_12_0)) { retentionPolicyConfig = in.readOptionalNamedWriteable(RetentionPolicyConfig.class); } else { retentionPolicyConfig = null; @@ -184,7 +184,7 @@ public void writeTo(final StreamOutput out) throws IOException { if (out.getVersion().onOrAfter(Version.V_7_8_0)) { out.writeOptionalWriteable(settings); } - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0 + if (out.getVersion().onOrAfter(Version.V_7_12_0)) { out.writeOptionalNamedWriteable(retentionPolicyConfig); } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java index 2151ebb682aff..7afb7194557b7 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformIndexerStats.java @@ -182,7 +182,7 @@ public TransformIndexerStats(StreamInput in) throws IOException { this.expAvgDocumentsIndexed = in.readDouble(); this.expAvgDocumentsProcessed = in.readDouble(); } - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0 + if (in.getVersion().onOrAfter(Version.V_7_12_0)) { this.numDeletedDocuments = in.readVLong(); this.deleteTime = in.readVLong(); } @@ -199,7 +199,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeDouble(this.expAvgDocumentsIndexed); out.writeDouble(this.expAvgDocumentsProcessed); } - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_12_0 + if (out.getVersion().onOrAfter(Version.V_7_12_0)) { out.writeVLong(numDeletedDocuments); out.writeVLong(deleteTime); } From ba807238340d1cb00532f25461309ec919088af0 Mon Sep 17 00:00:00 2001 From: Hendrik Muhs Date: Thu, 11 Feb 2021 08:37:14 +0100 Subject: [PATCH 2/2] reenable BWC --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b324328111d45..b24219df5533b 100644 --- a/build.gradle +++ b/build.gradle @@ -169,8 +169,8 @@ tasks.register("verifyVersions") { * after the backport of the backcompat code is complete. */ -boolean bwc_tests_enabled = false -String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/68814" /* place a PR link here when committing bwc changes */ +boolean bwc_tests_enabled = true +String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */ /* * 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