Merge pull request #17 from Azure/develop

Added pool resource files back to makeCluster
Azure · Apr 12, 2017 · 96ad39a · 96ad39a
2 parents e2796e9 + 6f75e4f
commit 96ad39a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: doAzureParallel
 Type: Package
 Title: doAzureParallel
-Version: 0.2.1
+Version: 0.2.2
 Author: Brian Hoang
 Maintainer: Who to complain to <yourfault@somewhere.net>
 Description: More about what it does (maybe more than one line)

diff --git a/R/cluster.R b/R/cluster.R
@@ -73,7 +73,7 @@ generateClusterConfig <- function(fileName, ...){
 #' @return The request to the Batch service was successful.
 #' @examples
 #' cluster <- makeCluster("cluster_config.json", fullName = TRUE, wait = TRUE)
-makeCluster <- function(fileName = "az_config.json", fullName = FALSE, wait = TRUE){
+makeCluster <- function(fileName = "az_config.json", fullName = FALSE, wait = TRUE, resourceFiles = list()){
   setPoolOption(fileName, fullName)
   config <- getOption("az_config")
   pool <- config$batchAccount$pool
@@ -94,7 +94,8 @@ makeCluster <- function(fileName = "az_config.json", fullName = FALSE, wait = TR
 
   response <- .addPool(
     pool = pool,
-    packages = packages)
+    packages = packages,
+    resourceFiles = resourceFiles)
 
   pool <- getPool(pool$name)
 

diff --git a/R/helpers.R b/R/helpers.R
@@ -87,7 +87,7 @@
   return(response)
 }
 
-.addPool <- function(pool, packages){
+.addPool <- function(pool, packages, resourceFiles){
   commands <- c("export PATH=/anaconda/envs/py35/bin:$PATH",
                 "env PATH=$PATH pip install --no-dependencies blobxfer")
 
@@ -106,6 +106,10 @@
     waitForSuccess = TRUE
   )
 
+  if(length(resourceFiles) > 0){
+    startTask$resourceFiles = resourceFiles
+  }
+
   virtualMachineConfiguration <- list(
     imageReference = list(publisher = "microsoft-ads",
                           offer = "linux-data-science-vm",