CLEANUP: Only needs to call cancel() on interrupts; it's already done by future::value() on errors

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.apply
-Version: 1.11.3-9014
+Version: 1.11.3-9015
 Title: Apply Function to Elements in Parallel using Futures
 Depends:
     R (>= 3.2.0),

R/future_xapply.R

@@ -300,7 +300,7 @@ future_xapply <- local({
         }) ## withCallingHandlers()
       } else {
         ## value() exits early if it detects a future with an error.
-        ## In future (> 1.40.0), non-resolved futures will be automatically
+        ## In future (>= 1.40.0), non-resolved futures will be automatically
         ## canceled if there's an error.
         value(fs)
       }
@@ -312,12 +312,12 @@ future_xapply <- local({
         host <- Sys.info()[["nodename"]]
         pid <- Sys.getpid()
         msg <- sprintf("%s() interrupted at %s, while running on %s (pid %s)", fcn_name, format(when, format = "%FT%T"), sQuote(host), pid)
-        warning(sprintf("%s. Cleaning up ...", msg), immediate. = TRUE, call. = FALSE)
+        warning(sprintf("%s. Canceling all iterations ...", msg), immediate. = TRUE, call. = FALSE)
+        
+        ## Interrupt all futures (if an error, value() already did it)
+        fs <- cancel(fs)
       }
 
-      ## Interrupt all futures
-      fs <- cancel(fs)
-
       ## Make sure all workers finish before continuing
       fs <- resolve(fs)
 

inst/testme/test-globals,tricky2.R

@@ -3,7 +3,7 @@
 #' @tags detritus-files
 #' @tags sequential multisession multicore
 
-if (packageVersion("future") > "1.40.0-9200") {
+if (packageVersion("future") > "1.49.0" && isTRUE(getOption("future.globals.keepWhere"))) {
 
   library(future.apply)
   options(future.debug = FALSE)