Added terminate job and added exitConditions for tasks (#37)

Azure · Sep 28, 2017 · d2e55dc · d2e55dc
1 parent 5c260a3
commit d2e55dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/R/job_operations.R b/R/job_operations.R
@@ -153,3 +153,19 @@ getJobTaskCounts <- function(jobId, content = "parsed") {
 
   callBatchService(request, batchCredentials, content)
 }
+
+terminateJob <- function(jobId, content = "response"){
+  batchCredentials <- getBatchCredentials()
+
+  headers <- c()
+  headers['Content-Length'] <- '0'
+
+  request <- AzureRequest$new(
+    method = "POST",
+    path = paste0("/jobs/", jobId, "/terminate"),
+    query = list("api-version" = apiVersion),
+    headers = headers
+  )
+
+  callBatchService(request, batchCredentials, content)
+}
diff --git a/R/storage_service.R b/R/storage_service.R
@@ -95,7 +95,7 @@ callStorageSas <- function(request, accountName, sasToken, ...) {
     body = body
   )
 
-  httr::stop_for_status(response)
+  response
 }
 
 prepareStorageRequest <- function(request, credentials) {

diff --git a/R/task_operations.R b/R/task_operations.R
@@ -7,6 +7,7 @@ addTask <- function(jobId, taskId = "default", content = "parsed", ...){
   commandLine <- args$commandLine
   dependsOn <- args$dependsOn
   outputFiles <- args$outputFiles
+  exitConditions <- args$exitConditions
 
   if (is.null(commandLine)) {
     stop("Task requires a command line.")
@@ -26,7 +27,8 @@ addTask <- function(jobId, taskId = "default", content = "parsed", ...){
               outputFiles = outputFiles,
               constraints = list(
                 maxTaskRetryCount = 3
-              ))
+              ),
+              exitConditions = exitConditions)
 
   body <- Filter(length, body)