Skip to content

Commit 6417e09

Browse files
authored
CrossClusterIT testCancel failure (#117750)
Investigate and fix test failure
1 parent ad83d9b commit 6417e09

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

docs/changelog/117750.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 117750
2+
summary: '`CrossClusterIT` `testCancel` failure'
3+
area: Search
4+
type: bug
5+
issues:
6+
- 108061

server/src/internalClusterTest/java/org/elasticsearch/search/ccs/CrossClusterIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import java.util.List;
6464
import java.util.Map;
6565
import java.util.concurrent.CountDownLatch;
66+
import java.util.concurrent.ExecutionException;
6667
import java.util.concurrent.TimeUnit;
6768
import java.util.concurrent.atomic.AtomicInteger;
6869
import java.util.concurrent.atomic.AtomicReference;
@@ -189,7 +190,6 @@ public void testProxyConnectionDisconnect() throws Exception {
189190
}
190191
}
191192

192-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/108061")
193193
public void testCancel() throws Exception {
194194
assertAcked(client(LOCAL_CLUSTER).admin().indices().prepareCreate("demo"));
195195
indexDocs(client(LOCAL_CLUSTER), "demo");
@@ -307,7 +307,7 @@ public void testCancel() throws Exception {
307307
}
308308
});
309309

310-
RuntimeException e = expectThrows(RuntimeException.class, () -> queryFuture.result());
310+
ExecutionException e = expectThrows(ExecutionException.class, () -> queryFuture.result());
311311
assertNotNull(e);
312312
assertNotNull(e.getCause());
313313
Throwable t = ExceptionsHelper.unwrap(e, TaskCancelledException.class);

0 commit comments

Comments
 (0)