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

ywangd · web-flow · commit e22bef6c4a05 · 2024-09-12T16:12:43.000+10:00
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
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/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/integrity/RepositoryIntegrityVerifier.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/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);
+                            }
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -934,7 +934,11 @@ public void onResponse(Releasable releasable) {`
`934`	`934`	`if (cancellableThreads.isCancelled()) {`
`935`	`935`	`runnable.onFailure(new TaskCancelledException("task cancelled"));`
`936`	`936`	`} else {`
`937`		`- cancellableThreads.execute(runnable::run);`
	`937`	`+ try {`
	`938`	`+ cancellableThreads.execute(runnable::run);`
	`939`	`+ } catch (RuntimeException e) {`
	`940`	`+ runnable.onFailure(e);`
	`941`	`+ }`
`938`	`942`	`}`
`939`	`943`	`}`
`940`	`944`	`}`