Skip to content

Commit 5eeb7d8

Browse files
committed
make finalizer/cleanup return TRUE on kill
1 parent 775d1d4 commit 5eeb7d8

6 files changed

+6
-6
lines changed

R/qsys_lsf.r

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ LSF = R6::R6Class("LSF",
4444
if (!private$is_cleaned_up) {
4545
system(paste("bkill -J", private$job_id),
4646
ignore.stdout=quiet, ignore.stderr=quiet, wait=FALSE)
47-
private$is_cleaned_up = TRUE
4847
}
48+
private$is_cleaned_up = TRUE
4949
}
5050
)
5151
)

R/qsys_multicore.r

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ MULTICORE = R6::R6Class("MULTICORE",
6464
tools::pskill(running, tools::SIGKILL)
6565
}
6666
private$children = list()
67-
private$is_cleaned_up = TRUE
6867
}
68+
private$is_cleaned_up = TRUE
6969
}
7070
)
7171
)

R/qsys_multiprocess.r

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ MULTIPROCESS = R6::R6Class("MULTIPROCESS",
5757
paste(names(private$callr), collapse=", "), immediate.=TRUE)
5858
for (cr in private$callr)
5959
cr$kill_tree()
60-
private$is_cleaned_up = TRUE
6160
}
61+
private$is_cleaned_up = TRUE
6262
}
6363
)
6464
)

R/qsys_sge.r

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ SGE = R6::R6Class("SGE",
4848
if (!private$is_cleaned_up) {
4949
system(paste("qdel", private$job_id),
5050
ignore.stdout=quiet, ignore.stderr=quiet, wait=FALSE)
51-
private$is_cleaned_up = TRUE
5251
}
52+
private$is_cleaned_up = TRUE
5353
}
5454
)
5555
)

R/qsys_slurm.r

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ SLURM = R6::R6Class("SLURM",
4343
if (!private$is_cleaned_up) {
4444
system(paste("scancel --name", private$job_id),
4545
ignore.stdout=quiet, ignore.stderr=quiet, wait=FALSE)
46-
private$is_cleaned_up = TRUE
4746
}
47+
private$is_cleaned_up = TRUE
4848
}
4949
)
5050
)

R/qsys_ssh.r

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ SSH = R6::R6Class("SSH",
6565
# list(id="PROXY_STOP", finalize=!private$is_cleaned_up),
6666
# "proxy"
6767
# )
68-
private$ssh_proxy_running = FALSE
6968
# }
69+
private$ssh_proxy_running = FALSE
7070
}
7171
)
7272
)

0 commit comments

Comments
 (0)