TESTS+DISTR.: Fix testIndexCheckOnStartup Flake (#33349) (#33355)

original-brownbear · web-flow · commit 61f400ef3b84 · 2018-09-03T22:35:18.000+02:00
* Ignore all `RuntimeException` since random file corruption triggers other RTE in addition to the randomly caught one * closes #33345
diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java
@@ -2594,7 +2594,6 @@ public void testReadSnapshotConcurrently() throws IOException, InterruptedExcept
         closeShards(newShard);
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/33345")
     public void testIndexCheckOnStartup() throws Exception {
         final IndexShard indexShard = newStartedShard(true);
 
@@ -2648,7 +2647,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
         try {
             closeShards(corruptedShard);
         } catch (RuntimeException e) {
-            assertThat(e.getMessage(), equalTo("CheckIndex failed"));
+            // Ignored because corrupted shard can throw various exceptions on close
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2594,7 +2594,6 @@ public void testReadSnapshotConcurrently() throws IOException, InterruptedExcept`
`2594`	`2594`	`closeShards(newShard);`
`2595`	`2595`	`}`
`2596`	`2596`
`2597`		`- @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/33345")`
`2598`	`2597`	`public void testIndexCheckOnStartup() throws Exception {`
`2599`	`2598`	`final IndexShard indexShard = newStartedShard(true);`
`2600`	`2599`
`@@ -2648,7 +2647,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO`
`2648`	`2647`	`try {`
`2649`	`2648`	`closeShards(corruptedShard);`
`2650`	`2649`	`} catch (RuntimeException e) {`
`2651`		`- assertThat(e.getMessage(), equalTo("CheckIndex failed"));`
	`2650`	`+ // Ignored because corrupted shard can throw various exceptions on close`
`2652`	`2651`	`}`
`2653`	`2652`	`}`
`2654`	`2653`