From f8f06735e5e9814f423e9e2343880fb30774496f Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 17 May 2021 11:32:12 +0100 Subject: [PATCH 1/3] Complete backport of #72931 Adjusts wire-compat and re-enables BWC tests --- build.gradle | 4 ++-- .../main/java/org/elasticsearch/tasks/TaskInfo.java | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 15c29ffe929ea..00d6814b668d1 100644 --- a/build.gradle +++ b/build.gradle @@ -213,9 +213,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/72931" +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 diff --git a/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java index 51ebac9ba4bb5..3b6e6e6e2fb15 100644 --- a/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java +++ b/server/src/main/java/org/elasticsearch/tasks/TaskInfo.java @@ -8,7 +8,6 @@ package org.elasticsearch.tasks; -import org.elasticsearch.Version; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.Strings; import org.elasticsearch.common.bytes.BytesReference; @@ -104,11 +103,7 @@ public TaskInfo(StreamInput in) throws IOException { startTime = in.readLong(); runningTimeNanos = in.readLong(); cancellable = in.readBoolean(); - if (in.getVersion().onOrAfter(Version.V_8_0_0)) { - cancelled = in.readBoolean(); - } else { - cancelled = false; // older versions do not report when tasks are cancelled so we just assume they aren't - } + cancelled = in.readBoolean(); assert cancellable || cancelled == false : "uncancellable task cannot be cancelled"; parentTaskId = TaskId.readFromStream(in); headers = in.readMap(StreamInput::readString, StreamInput::readString); @@ -124,9 +119,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeLong(startTime); out.writeLong(runningTimeNanos); out.writeBoolean(cancellable); - if (out.getVersion().onOrAfter(Version.V_8_0_0)) { - out.writeBoolean(cancelled); - } // older versions do not report when tasks are cancelled anyway so it's ok just to drop this flag + out.writeBoolean(cancelled); parentTaskId.writeTo(out); out.writeMap(headers, StreamOutput::writeString, StreamOutput::writeString); } From 0d9932b58270605e7be9644f4a01debd1830129c Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 17 May 2021 12:59:06 +0100 Subject: [PATCH 2/3] Lost fix? Reapplied --- .../monitoring/collector/enrich/ExecutingPolicyDocTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/monitoring/collector/enrich/ExecutingPolicyDocTests.java b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/monitoring/collector/enrich/ExecutingPolicyDocTests.java index 8f0886fd3bad3..ff4b9dfcc60ad 100644 --- a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/monitoring/collector/enrich/ExecutingPolicyDocTests.java +++ b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/monitoring/collector/enrich/ExecutingPolicyDocTests.java @@ -125,7 +125,7 @@ public void testToXContent() throws IOException { + "\"cancellable\":" + executingPolicy.getTaskInfo().isCancellable() + (executingPolicy.getTaskInfo().isCancellable() - ? ",\"cancelled\":" + executingPolicy.getTaskInfo().isCancellable() + ? ",\"cancelled\":" + executingPolicy.getTaskInfo().isCancelled() : "") + "," + header.map(entry -> String.format(Locale.ROOT, "\"headers\":{\"%s\":\"%s\"}", entry.getKey(), entry.getValue())) From 4324322eca3435ec84ee104dbd2e29f0ddfaf6a3 Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 17 May 2021 13:05:07 +0100 Subject: [PATCH 3/3] Spotless --- .../monitoring/collector/enrich/ExecutingPolicyDocTests.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/monitoring/collector/enrich/ExecutingPolicyDocTests.java b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/monitoring/collector/enrich/ExecutingPolicyDocTests.java index ff4b9dfcc60ad..11c034074d314 100644 --- a/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/monitoring/collector/enrich/ExecutingPolicyDocTests.java +++ b/x-pack/plugin/enrich/src/test/java/org/elasticsearch/xpack/monitoring/collector/enrich/ExecutingPolicyDocTests.java @@ -124,9 +124,7 @@ public void testToXContent() throws IOException { + "," + "\"cancellable\":" + executingPolicy.getTaskInfo().isCancellable() - + (executingPolicy.getTaskInfo().isCancellable() - ? ",\"cancelled\":" + executingPolicy.getTaskInfo().isCancelled() - : "") + + (executingPolicy.getTaskInfo().isCancellable() ? ",\"cancelled\":" + executingPolicy.getTaskInfo().isCancelled() : "") + "," + header.map(entry -> String.format(Locale.ROOT, "\"headers\":{\"%s\":\"%s\"}", entry.getKey(), entry.getValue())) .orElse("\"headers\":{}")