From b1745ee1d34619029d1965f5a8560a7f879c929b Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 20 Dec 2021 11:08:58 -0500 Subject: [PATCH 1/4] Revert "Disable BWC tests to upgrade Lucene on 7.17 (#81930)" This reverts commit a711a72e08c4d87f6874f340cc498e3e19083199. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 1a3a3b4accdfb..978d2fefee794 100644 --- a/build.gradle +++ b/build.gradle @@ -131,9 +131,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/81900" +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 From f76f347e96f9f42aba658b1d1fe96119864ab01a Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 20 Dec 2021 11:14:52 -0500 Subject: [PATCH 2/4] Adjust Lucene version on 7.17 --- server/src/main/java/org/elasticsearch/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index d4713175d577f..55ebabf2d0547 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -94,7 +94,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_7_16_0 = new Version(7160099, org.apache.lucene.util.Version.LUCENE_8_10_1); public static final Version V_7_16_1 = new Version(7160199, org.apache.lucene.util.Version.LUCENE_8_10_1); public static final Version V_7_16_2 = new Version(7160299, org.apache.lucene.util.Version.LUCENE_8_10_1); - public static final Version V_7_17_0 = new Version(7170099, org.apache.lucene.util.Version.LUCENE_8_10_1); + public static final Version V_7_17_0 = new Version(7170099, org.apache.lucene.util.Version.fromBits(8, 11, 1)); public static final Version V_8_0_0 = new Version(8000099, org.apache.lucene.util.Version.LUCENE_9_0_0); public static final Version V_8_1_0 = new Version(8010099, org.apache.lucene.util.Version.LUCENE_9_0_0); public static final Version CURRENT = V_8_1_0; From 73b7063d63da1db1717fe8f4061e1367eab7c384 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 20 Dec 2021 12:41:06 -0500 Subject: [PATCH 3/4] Ignore Scripted Field with error accessing an unsupported field via the script fields api --- modules/lang-painless/build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index ae3a9ee4ca5d7..9106566d46ed3 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -60,6 +60,7 @@ tasks.named("test").configure { tasks.named("yamlRestTestV7CompatTest").configure { systemProperty 'tests.rest.blacklist', [ + 'painless/20_scriptfield/Scripted Field with error accessing an unsupported field via the script fields api', 'painless/20_scriptfield/Scripted Field Doing Compare (fields api)', 'painless/70_execute_painless_scripts/Execute with double field context (single-value, fields api)', 'painless/70_execute_painless_scripts/Execute with double field context (single-value, fields api)', @@ -95,7 +96,7 @@ tasks.named("yamlRestTestV7CompatTest").configure { 'painless/40_fields_api/script fields api for dates', 'painless/70_execute_painless_scripts/Execute with double field context (multi-value, fields api)', 'painless/40_fields_api/filter script fields api', - 'painless/40_fields_api/script score fields api' + 'painless/40_fields_api/script score fields api', ].join(',') } From b5cc07599e423c597589e4a587d80d2527a77b71 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 20 Dec 2021 12:42:22 -0500 Subject: [PATCH 4/4] Stylecheck --- modules/lang-painless/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index 9106566d46ed3..e6d1ae4801a60 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -96,7 +96,7 @@ tasks.named("yamlRestTestV7CompatTest").configure { 'painless/40_fields_api/script fields api for dates', 'painless/70_execute_painless_scripts/Execute with double field context (multi-value, fields api)', 'painless/40_fields_api/filter script fields api', - 'painless/40_fields_api/script score fields api', + 'painless/40_fields_api/script score fields api' ].join(',') }