BUG FIX: result() on a canceled and interrupted cluster future returned the future instead of producing a FutureInterruptError.

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future
-Version: 1.67.0-9017
+Version: 1.67.0-9018
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Depends:
     R (>= 3.2.0)

NEWS.md

@@ -13,6 +13,9 @@ repeat. This release fixes a few more regressions introduced in
 
 ## Bug Fixes
 
+ * `result()` on a canceled and interrupted cluster future returned
+   the future instead of producing a FutureInterruptError.
+
  * The `cluster` backend failed when used with an `MPIcluster` as
    created by `parallel::makeCluster(..., type = "MPI")`. This bug was
    introduced in **future** (>= 1.40.0) [2025-04-10].

R/backend_api-11.ClusterFutureBackend-class.R

@@ -775,7 +775,11 @@ result.ClusterFuture <- function(future, ...) {
       ## worker also shutting done? If so, turn the error into a run-time
       ## FutureInterruptError and revive the worker
       future <- handleInterruptedFuture(backend, future = future)
-      return(future)
+      stop_if_not(inherits(future, "Future"))
+      result <- future[["result"]]
+      if (inherits(result, "FutureError")) stop(result)
+      stop_if_not(inherits(future, "FutureResult"))
+      return(result)
     }
     assertValidConnection(future)
   }

inst/testme/test-cancel.R

@@ -60,7 +60,13 @@ for (strategy in strategies) {
     f <- cancel(f)
   }
 
-  message("  Create another future")
+  message("  Create another canceled future")
+  f <- future({ Sys.sleep(0.5); 42 })
+  f <- cancel(f)
+  v <- tryCatch(value(f), FutureInterruptError = identity)
+  stopifnot(is.numeric(v) || inherits(v, "FutureInterruptError"))
+
+  message("  Create yet another future")
   ## Create another future
   f <- future(42)
   v <- value(f)