Do not throw in task enqueued by CancellableRunner (#112780)

CancellableThreads#excute can throw runtime exception including cancellation. This does not work with AbstractThrottledTaskRunner which expects enqueued task to _not_ throw. This PR catches any runtime exception from CancellableThreads and hand it back to the original runnable. Resolves: #112779
elastic · Sep 12, 2024 · 6fdb78c · 6fdb78c
1 parent 9f5b528
commit 6fdb78c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -211,9 +211,6 @@ tests:
 - class: org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT
   method: testCorruption
   issue: https://github.com/elastic/elasticsearch/issues/112769
-- class: org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT
-  method: testTransportException
-  issue: https://github.com/elastic/elasticsearch/issues/112779
 - class: org.elasticsearch.script.StatsSummaryTests
   method: testEqualsAndHashCode
   issue: https://github.com/elastic/elasticsearch/issues/112439

diff --git a/...g/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryIntegrityVerifier.java b/...g/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryIntegrityVerifier.java
@@ -934,7 +934,11 @@ public void onResponse(Releasable releasable) {
                         if (cancellableThreads.isCancelled()) {
                             runnable.onFailure(new TaskCancelledException("task cancelled"));
                         } else {
-                            cancellableThreads.execute(runnable::run);
+                            try {
+                                cancellableThreads.execute(runnable::run);
+                            } catch (RuntimeException e) {
+                                runnable.onFailure(e);
+                            }
                         }
                     }
                 }