Skip to content

Commit 1918a30

Browse files
authored
Upgrade to Lucene-7.4.0-snapshot-cc2ee23050 (#30778)
The new snapshot includes LUCENE-8324 which fixes missing checkpoint after a fully deletes segment is dropped on flush. This snapshot should resolves failed tests in the CorruptedFileIT suite. Closes #30741 Closes #30577
1 parent 9ffeb17 commit 1918a30

File tree

53 files changed

+28
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+28
-34
lines changed

buildSrc/version.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 7.0.0-alpha1
2-
lucene = 7.4.0-snapshot-59f2b7aec2
2+
lucene = 7.4.0-snapshot-cc2ee23050
33

44
# optional dependencies
55
spatial4j = 0.7

modules/lang-expression/licenses/lucene-expressions-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1e28b448387ec05d655f8c81ee54e13ff2975a4d

plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
452c9a9f86b79b9b3eaa7d6aa782e189d5bcfe8f

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
48c76a922bdfc7f50b1b6fe22e9456c555f3f990

plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4db5777df468b0867ff6539c9ab687e0ed6cab41

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0e09e6b011ab2b1a0e3e0e1df2ab2a91dca8ba23

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ceefa0f9789ab9ea5c8ab9f67ed7a601a3ae6aa9

plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b013adc183e52a74795ad3d3032f4d0f9db30b73

plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
95300f29418f60e57e022d934d3462be9e1e2225

server/licenses/lucene-analyzers-common-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
96ab108569c77932ecb17c45421affece207df5c

server/licenses/lucene-backward-codecs-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
72d09ca50979f716a57f53f2de33d55023a166ec

server/licenses/lucene-core-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e118e4d05070378516b9055184b74498ba528dee

server/licenses/lucene-grouping-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2b2ea6bfe6fa159bbf205bf7f7fa2ed2c22bbffc

server/licenses/lucene-highlighter-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
423e4fff9276101d845d6073dc6cd27504def207

server/licenses/lucene-join-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
27561038da2edcae3ecc3a08b0a52824966af87a

server/licenses/lucene-memory-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d7d422159f705261784d121e24877119d9c95083

server/licenses/lucene-misc-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fc09508fde6ba87f241d7e3148d9e310c0db9cb9

server/licenses/lucene-queries-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
201fdf3432ff3fef0f48c38c2c0f482c144f6868

server/licenses/lucene-queryparser-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
917df8c8d08952a012a34050b183b6204ae7081b

server/licenses/lucene-sandbox-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
caff84fa66cb0376835c39f3d4ca7dfd2177d8f4

server/licenses/lucene-spatial-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e1bce61a9d9129a8d0fdd3127a84665d29f53eb0

server/licenses/lucene-spatial-extras-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3a2e4373d79fda968a078971efa2cb8ec9ff65b0

server/licenses/lucene-spatial3d-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7f14927e5c3c1c85c4c5b3681c28c5e36f241dda

server/licenses/lucene-suggest-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6e708a38c957a655e0cfedb06a1b9aa892929db0

server/src/test/java/org/elasticsearch/index/store/CorruptedFileIT.java

-6
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,6 @@ protected void sendRequest(Connection connection, long requestId, String action,
470470
* TODO once checksum verification on snapshotting is implemented this test needs to be fixed or split into several
471471
* parts... We should also corrupt files on the actual snapshot and check that we don't restore the corrupted shard.
472472
*/
473-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/30577")
474-
@TestLogging("org.elasticsearch.repositories:TRACE,org.elasticsearch.snapshots:TRACE,org.elasticsearch.index.engine:DEBUG")
475473
public void testCorruptFileThenSnapshotAndRestore() throws ExecutionException, InterruptedException, IOException {
476474
int numDocs = scaledRandomIntBetween(100, 1000);
477475
internalCluster().ensureAtLeastNumDataNodes(2);
@@ -520,10 +518,6 @@ public void testCorruptFileThenSnapshotAndRestore() throws ExecutionException, I
520518
break;
521519
}
522520
}
523-
if (snapshotState != SnapshotState.PARTIAL) {
524-
logger.info("--> listing shard files for investigation");
525-
files.forEach(f -> logger.info("path: {}", f.toAbsolutePath()));
526-
}
527521
assertThat(createSnapshotResponse.getSnapshotInfo().state(), equalTo(SnapshotState.PARTIAL));
528522
assertThat(corruptedFile, notNullValue());
529523
}

test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,9 @@ private static String toCamelCase(String s) {
217217
// should we expose it, or maybe think about higher level integration of the
218218
// fake term frequency feature (LUCENE-7854)
219219
.put("delimitedtermfrequency", Void.class)
220-
// LUCENE-8273: ConditionalTokenFilter allows analysis chains to skip
220+
// LUCENE-8273: ProtectedTermFilterFactory allows analysis chains to skip
221221
// particular token filters based on the attributes of the current token.
222-
.put("termexclusion", Void.class)
222+
.put("protectedterm", Void.class)
223223

224224
.immutableMap();
225225

x-pack/plugin/sql/jdbc/licenses/lucene-core-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e118e4d05070378516b9055184b74498ba528dee

x-pack/plugin/sql/sql-proto/licenses/lucene-core-7.4.0-snapshot-59f2b7aec2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e118e4d05070378516b9055184b74498ba528dee

0 commit comments

Comments
 (0)