Repository: spark Updated Branches: refs/heads/branch-2.0 4c96ded84 -> d6588115a
[SPARK-16299][SPARKR] Capture errors from R workers in daemon.R to avoid deletion of R session temporary directory. ## What changes were proposed in this pull request? Capture errors from R workers in daemon.R to avoid deletion of R session temporary directory. See detailed description at https://issues.apache.org/jira/browse/SPARK-16299 ## How was this patch tested? SparkR unit tests. Author: Sun Rui <[email protected]> Closes #13975 from sun-rui/SPARK-16299. (cherry picked from commit e4fa58c43ce2bf8d76bffb0d9dc1132f8d0eae6a) Signed-off-by: Shivaram Venkataraman <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d6588115 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d6588115 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d6588115 Branch: refs/heads/branch-2.0 Commit: d6588115a9ec3178f7d1edc86418a9832c9b3ac7 Parents: 4c96ded Author: Sun Rui <[email protected]> Authored: Fri Jul 1 14:37:03 2016 -0700 Committer: Shivaram Venkataraman <[email protected]> Committed: Fri Jul 1 14:37:10 2016 -0700 ---------------------------------------------------------------------- R/pkg/inst/worker/daemon.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/d6588115/R/pkg/inst/worker/daemon.R ---------------------------------------------------------------------- diff --git a/R/pkg/inst/worker/daemon.R b/R/pkg/inst/worker/daemon.R index f55beac..b92e6be 100644 --- a/R/pkg/inst/worker/daemon.R +++ b/R/pkg/inst/worker/daemon.R @@ -44,7 +44,7 @@ while (TRUE) { if (inherits(p, "masterProcess")) { close(inputCon) Sys.setenv(SPARKR_WORKER_PORT = port) - source(script) + try(source(script)) # Set SIGUSR1 so that child can exit tools::pskill(Sys.getpid(), tools::SIGUSR1) parallel:::mcexit(0L) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
