Upgrade to Lucene-7.7.2 on 6.8 (#43127)

This change upgrades Lucene on 6.8 to 7.7.2 to include LUCENE-8809 so we can enable the accounting check. Relates #30290
elastic · Jun 12, 2019 · 0dd8cd8 · 0dd8cd8
1 parent 9c3a06f
commit 0dd8cd8
Show file tree

Hide file tree

Showing 53 changed files with 37 additions and 39 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 elasticsearch     = 6.8.1
-lucene            = 7.7.0
+lucene            = 7.7.2
 
 # optional dependencies
 spatial4j         = 0.7

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -1,7 +1,7 @@
 :version:               6.8.0
 :major-version:         6.x
-:lucene_version:        7.7.0
-:lucene_version_path:   7_7_0
+:lucene_version:        7.7.2
+:lucene_version_path:   7_7_2
 :branch:                6.8
 :jdk:                   1.8.0_131
 :jdk_major:             8

diff --git a/modules/lang-expression/licenses/lucene-expressions-7.7.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.7.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.7.2.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.7.2.jar.sha1
@@ -0,0 +1 @@
+1600b7bf11dc54fb81f846d88fd42a89ae311793
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.7.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.7.0.jar.sha1
diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.7.2.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.7.2.jar.sha1
@@ -0,0 +1 @@
+5ac4e60623ea69de8446d1729c95a92f248d91f2
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.7.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.7.0.jar.sha1
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.7.2.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.7.2.jar.sha1
@@ -0,0 +1 @@
+4d1196c614ff20c09c500fb0a3e9f6f5978ef14b
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.7.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.7.0.jar.sha1
diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.7.2.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.7.2.jar.sha1
@@ -0,0 +1 @@
+88fa846b85166cc758c95c34a1f69f310586bb0e
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.7.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.7.0.jar.sha1
diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.7.2.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.7.2.jar.sha1
@@ -0,0 +1 @@
+28a9ac076a2a1481484784be18d25e86223fe5ec
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.7.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.7.0.jar.sha1
diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.7.2.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.7.2.jar.sha1
@@ -0,0 +1 @@
+a3ee27024c65456e0b6f334287d6a5b154eb15d0
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.7.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.7.0.jar.sha1
diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.7.2.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.7.2.jar.sha1
@@ -0,0 +1 @@
+7e83f602156fc64e4625873270b18ad9013c28f4
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.7.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.7.0.jar.sha1
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.7.2.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.7.2.jar.sha1
@@ -0,0 +1 @@
+54ac33152af19bf63d0bc36408f2414ad7d5d259
diff --git a/server/licenses/lucene-analyzers-common-7.7.0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-analyzers-common-7.7.2.jar.sha1 b/server/licenses/lucene-analyzers-common-7.7.2.jar.sha1
@@ -0,0 +1 @@
+b350eef042d3950b3ca6b7532abb7a6606b1aa51
diff --git a/server/licenses/lucene-backward-codecs-7.7.0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-backward-codecs-7.7.2.jar.sha1 b/server/licenses/lucene-backward-codecs-7.7.2.jar.sha1
@@ -0,0 +1 @@
+ad01c9dd522e69c72a49b9c958386e275a7bc974
diff --git a/server/licenses/lucene-core-7.7.0.jar.sha1 b/server/licenses/lucene-core-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-core-7.7.2.jar.sha1 b/server/licenses/lucene-core-7.7.2.jar.sha1
@@ -0,0 +1 @@
+1febe49946a08a42a1de72e9922346b885c9cdf6
diff --git a/server/licenses/lucene-grouping-7.7.0.jar.sha1 b/server/licenses/lucene-grouping-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-grouping-7.7.2.jar.sha1 b/server/licenses/lucene-grouping-7.7.2.jar.sha1
@@ -0,0 +1 @@
+cc476b6f8aca55b3be7fa62021c6ee27b8a21b94
diff --git a/server/licenses/lucene-highlighter-7.7.0.jar.sha1 b/server/licenses/lucene-highlighter-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-highlighter-7.7.2.jar.sha1 b/server/licenses/lucene-highlighter-7.7.2.jar.sha1
@@ -0,0 +1 @@
+0b74c604278259abe170a52e71e2ac8c1b745aab
diff --git a/server/licenses/lucene-join-7.7.0.jar.sha1 b/server/licenses/lucene-join-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-join-7.7.2.jar.sha1 b/server/licenses/lucene-join-7.7.2.jar.sha1
@@ -0,0 +1 @@
+6bd016367240b80a3537a9e5507440eb4925caf7
diff --git a/server/licenses/lucene-memory-7.7.0.jar.sha1 b/server/licenses/lucene-memory-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-memory-7.7.2.jar.sha1 b/server/licenses/lucene-memory-7.7.2.jar.sha1
@@ -0,0 +1 @@
+cf59697cc1fab979d2441cb93c102ceffeac0846
diff --git a/server/licenses/lucene-misc-7.7.0.jar.sha1 b/server/licenses/lucene-misc-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-misc-7.7.2.jar.sha1 b/server/licenses/lucene-misc-7.7.2.jar.sha1
@@ -0,0 +1 @@
+431ba0ece67d1c420ca87dce911fe34f4b65863b
diff --git a/server/licenses/lucene-queries-7.7.0.jar.sha1 b/server/licenses/lucene-queries-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-queries-7.7.2.jar.sha1 b/server/licenses/lucene-queries-7.7.2.jar.sha1
@@ -0,0 +1 @@
+16d62860be92889b2127910be849349684accfd7
diff --git a/server/licenses/lucene-queryparser-7.7.0.jar.sha1 b/server/licenses/lucene-queryparser-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-queryparser-7.7.2.jar.sha1 b/server/licenses/lucene-queryparser-7.7.2.jar.sha1
@@ -0,0 +1 @@
+69179c579faf7c612764ebf017fe79995e8bc529
diff --git a/server/licenses/lucene-sandbox-7.7.0.jar.sha1 b/server/licenses/lucene-sandbox-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-sandbox-7.7.2.jar.sha1 b/server/licenses/lucene-sandbox-7.7.2.jar.sha1
@@ -0,0 +1 @@
+7d03928b0c8d51ea84934d274ce3b111f97f4887
diff --git a/server/licenses/lucene-spatial-7.7.0.jar.sha1 b/server/licenses/lucene-spatial-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-7.7.2.jar.sha1 b/server/licenses/lucene-spatial-7.7.2.jar.sha1
@@ -0,0 +1 @@
+a57545aaa1c641a07782c604550883a9d210f86e
diff --git a/server/licenses/lucene-spatial-extras-7.7.0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-spatial-extras-7.7.2.jar.sha1 b/server/licenses/lucene-spatial-extras-7.7.2.jar.sha1
@@ -0,0 +1 @@
+fbf105dab33f40f009b948fba15cd29f08e1c867
diff --git a/server/licenses/lucene-spatial3d-7.7.0.jar.sha1 b/server/licenses/lucene-spatial3d-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-spatial3d-7.7.2.jar.sha1 b/server/licenses/lucene-spatial3d-7.7.2.jar.sha1
@@ -0,0 +1 @@
+7565159ad1645c93704872382b34c67665faf929
diff --git a/server/licenses/lucene-suggest-7.7.0.jar.sha1 b/server/licenses/lucene-suggest-7.7.0.jar.sha1
diff --git a/server/licenses/lucene-suggest-7.7.2.jar.sha1 b/server/licenses/lucene-suggest-7.7.2.jar.sha1
@@ -0,0 +1 @@
+5aebac6a28b811f22f86ca109293f1a00f769610
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -217,7 +217,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final int V_6_8_0_ID = 6080099;
     public static final Version V_6_8_0 = new Version(V_6_8_0_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
     public static final int V_6_8_1_ID = 6080199;
-    public static final Version V_6_8_1 = new Version(V_6_8_1_ID, org.apache.lucene.util.Version.LUCENE_7_7_0);
+    public static final Version V_6_8_1 = new Version(V_6_8_1_ID, org.apache.lucene.util.Version.LUCENE_7_7_2);
 
     public static final Version CURRENT = V_6_8_1;
 

diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
@@ -5683,7 +5683,6 @@ public void testMaxSeqNoInCommitUserData() throws Exception {
         assertMaxSeqNoInCommitUserData(engine);
     }
 
-    @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/LUCENE-8809")
     public void testRefreshAndFailEngineConcurrently() throws Exception {
         AtomicBoolean stopped = new AtomicBoolean();
         Semaphore indexedDocs = new Semaphore(0);

diff --git a/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java b/test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
@@ -2308,16 +2308,15 @@ public void ensureEstimatedStats() {
                 CircuitBreaker fdBreaker = breakerService.getBreaker(CircuitBreaker.FIELDDATA);
                 assertThat("Fielddata breaker not reset to 0 on node: " + name, fdBreaker.getUsed(), equalTo(0L));
 
-                // Mute this assertion until we have a new Lucene snapshot with https://issues.apache.org/jira/browse/LUCENE-8809.
-                // try {
-                //    assertBusy(() -> {
-                //        CircuitBreaker acctBreaker = breakerService.getBreaker(CircuitBreaker.ACCOUNTING);
-                //        assertThat("Accounting breaker not reset to 0 on node: " + name + ", are there still Lucene indices around?",
-                //            acctBreaker.getUsed(), equalTo(0L));
-                //    });
-                // } catch (Exception e) {
-                //    throw new AssertionError("Exception during check for accounting breaker reset to 0", e);
-                // }
+                try {
+                    assertBusy(() -> {
+                        CircuitBreaker acctBreaker = breakerService.getBreaker(CircuitBreaker.ACCOUNTING);
+                        assertThat("Accounting breaker not reset to 0 on node: " + name + ", are there still Lucene indices around?",
+                            acctBreaker.getUsed(), equalTo(0L));
+                    });
+                } catch (Exception e) {
+                    throw new AssertionError("Exception during check for accounting breaker reset to 0", e);
+                }
 
                 // Anything that uses transport or HTTP can increase the
                 // request breaker (because they use bigarrays), because of

diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.7.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.7.0.jar.sha1
diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.7.2.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.7.2.jar.sha1
@@ -0,0 +1 @@
+1febe49946a08a42a1de72e9922346b885c9cdf6