Do not throw in task enqueued by CancellableRunner (elastic#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: elastic#112779 (cherry picked from commit e22bef6) # Conflicts: # muted-tests.yml
ywangd · Sep 12, 2024 · ffd4a2e · ffd4a2e
1 parent f217322
commit ffd4a2e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -208,6 +208,12 @@ tests:
 - class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
   method: test {yaml=reference/cluster/stats/line_1450}
   issue: https://github.com/elastic/elasticsearch/issues/112732
+- class: org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT
+  method: testCorruption
+  issue: https://github.com/elastic/elasticsearch/issues/112769
+- class: org.elasticsearch.script.StatsSummaryTests
+  method: testEqualsAndHashCode
+  issue: https://github.com/elastic/elasticsearch/issues/112439
 
 # Examples:
 #

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);
+                            }
                         }
                     }
                 }