Skip to content
This repository was archived by the owner on Oct 12, 2023. It is now read-only.

Commit 2106f23

Browse files
committed
add errorHandling to job metadata
1 parent 560293f commit 2106f23

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

R/doAzureParallel.R

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,12 +363,23 @@ setHttpTraffic <- function(value = FALSE) {
363363
metadata <-
364364
list(enableCloudCombineKeyValuePair, chunkSizeKeyValuePair)
365365

366+
metadataCount <- 3
366367
if (!is.null(obj$packages)) {
367368
packagesKeyValuePair <-
368369
list(name = "packages",
369370
value = paste(obj$packages, collapse = ";"))
370371

371-
metadata[[3]] <-packagesKeyValuePair
372+
metadata[[metadataCount]] <-packagesKeyValuePair
373+
metadataCount <- metadataCount + 1
374+
}
375+
376+
if (!is.null(obj$errorHandling)) {
377+
errorHandlingKeyValuePair <-
378+
list(name = "errorHandling",
379+
value = as.character(obj$errorHandling))
380+
381+
metadata[[metadataCount]] <- errorHandlingKeyValuePair
382+
metadataCount <- metadataCount + 1
372383
}
373384

374385
response <- .addJob(

R/utility.R

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ getJob <- function(jobId, verbose = TRUE) {
149149
list(
150150
chunkSize = 1,
151151
enableCloudCombine = "TRUE",
152-
packages = ""
152+
packages = "",
153+
errorHandling = "stop"
153154
)
154155

155156
if (!is.null(job$metadata)) {
@@ -167,6 +168,8 @@ getJob <- function(jobId, verbose = TRUE) {
167168
fill = TRUE)
168169
cat(sprintf("\tpackages: %s", metadata$packages),
169170
fill = TRUE)
171+
cat(sprintf("\terrorHandling: %s", metadata$errorHandling),
172+
fill = TRUE)
170173
}
171174

172175
taskCounts <- rAzureBatch::getJobTaskCounts(jobId = jobId)

tests/testthat/test-long-running-job.R

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ test_that("Long Running Job Test", {
1414
cluster <- doAzureParallel::makeCluster(clusterFileName)
1515
doAzureParallel::registerDoAzureParallel(cluster)
1616

17-
options <- list(wait = FALSE, job = 'myjob')
17+
#options <- list(wait = FALSE, job = 'myjob')
18+
options <- list(wait = FALSE)
1819
'%dopar%' <- foreach::'%dopar%'
1920
jobId <-
2021
foreach::foreach(
2122
i = 1:4,
2223
.packages = c('httr'),
24+
.errorhandling = "stop",
2325
.options.azure = options
2426
) %dopar% {
2527
mean(1:3)

0 commit comments

Comments
 (0)