BUG FIX: makeClusterPSOCK() could produce an error on "getOptionOrEnv…

…Var" not found [#23]
HenrikBengtsson · Oct 22, 2020 · bb4cf63 · bb4cf63
1 parent eb1f426
commit bb4cf63
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -5,6 +5,10 @@ Version: 1.20.0-9000 [2020-10-21]
 
 BUG FIXES:
 
+ * makeClusterPSOCK() would produce an error on 'one node produced an error:
+   could not find function "getOptionOrEnvVar"' if 'parallelly' is not
+   available on the worker.
+
  * The error message on using an invalid 'rscript_envs' argument for
    makeClusterPSOCK() reported on the value of 'rscript_libs' (sic!).
 

diff --git a/R/makeClusterPSOCK.R b/R/makeClusterPSOCK.R
@@ -1216,7 +1216,8 @@ add_cluster_session_info <- function(cl) {
     ## Session information already collected?
     if (!is.null(node$session_info)) next
 
-    node$session_info <- clusterCall(cl[ii], fun = session_info)[[1]]
+    pkgs <- getOptionOrEnvVar("future.makeNodePSOCK.sessionInfo.pkgs", FALSE)
+    node$session_info <- clusterCall(cl[ii], fun = session_info, pkgs = pkgs)[[1]]
 
     ## Sanity check, iff possible
     if (inherits(node, "SOCK0node") || inherits(node, "SOCKnode")) {

diff --git a/tests/makeClusterPSOCK.R b/tests/makeClusterPSOCK.R
@@ -51,6 +51,16 @@ print(cl)
 parallel::stopCluster(cl)
 
 
+message("- makeClusterPSOCK() - w/out 'parallelly' on worker")
+
+ovalue <- Sys.getenv("R_LIBS_USER")
+Sys.setenv(R_LIBS_USER = tempdir())
+cl <- makeClusterPSOCK(1L, outfile = "")
+print(cl)
+parallel::stopCluster(cl)
+Sys.setenv(R_LIBS_USER = ovalue)
+
+
 message("- makeClusterPSOCK() - exceptions")
 
 res <- tryCatch({