Canceled future throw FutureCanceledError, which inherits from FutureInterruptError

Author: HenrikBengtsson

DESCRIPTION

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

R/backend_api-11.ClusterFutureBackend-class.R

@@ -1523,7 +1523,11 @@ handleInterruptedFuture <- local({
       pid <- node[["session_info"]][["process"]][["pid"]]
       if (!is.null(pid)) msg <- sprintf("%s (pid %s)", msg, pid)
     }
-    result <- FutureInterruptError(msg, future = future)
+    if (state %in% "canceled") {
+      result <- FutureCanceledError(msg, future = future)
+    } else {
+      result <- FutureInterruptError(msg, future = future)
+    }
     future[["result"]] <- result
 
     ## Remove from backend

R/backend_api-11.MulticoreFutureBackend-class.R

@@ -419,7 +419,11 @@ result.MulticoreFuture <- local({
         if (future[["state"]] %in% c("canceled", "interrupted")) {
           if (debug) mdebugf("Detected interrupted %s whose result cannot be retrieved", sQuote(class(future)[1]))
           msg <- sprintf("A future (%s) of class %s was interrupted, while running on localhost (pid %d)", label, class(future)[1], pid)
-          result <- FutureInterruptError(msg, future = future)
+          if (future[["state"]] %in% "canceled") {
+            result <- FutureCanceledError(msg, future = future)
+          } else {
+            result <- FutureInterruptError(msg, future = future)
+          }
           future[["result"]] <- result
 
           ## Remove from backend