Browse Source

CrossClusterIT testCancel failure (#117750) (#117761)

Investigate and fix test failure
Dimitris Rempapis 10 months ago
parent
commit
0c50f6f356

+ 6 - 0
docs/changelog/117750.yaml

@@ -0,0 +1,6 @@
+pr: 117750
+summary: '`CrossClusterIT` `testCancel` failure'
+area: Search
+type: bug
+issues:
+ - 108061

+ 2 - 2
server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterIT.java

@@ -63,6 +63,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
@@ -189,7 +190,6 @@ public class CrossClusterIT extends AbstractMultiClustersTestCase {
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/108061")
     public void testCancel() throws Exception {
         assertAcked(client(LOCAL_CLUSTER).admin().indices().prepareCreate("demo"));
         indexDocs(client(LOCAL_CLUSTER), "demo");
@@ -307,7 +307,7 @@ public class CrossClusterIT extends AbstractMultiClustersTestCase {
             }
         });
 
-        RuntimeException e = expectThrows(RuntimeException.class, () -> queryFuture.result());
+        ExecutionException e = expectThrows(ExecutionException.class, () -> queryFuture.result());
         assertNotNull(e);
         assertNotNull(e.getCause());
         Throwable t = ExceptionsHelper.unwrap(e, TaskCancelledException.class);