use common cleanup, clean flag

mschubert · Aug 11, 2018 · 36d7861 · 36d7861
1 parent 7100d58
commit 36d7861
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 21 deletions.
diff --git a/R/qsys.r b/R/qsys.r
@@ -134,6 +134,8 @@ QSys = R6::R6Class("QSys",
             success = self$workers_running == 0
             if (!quiet)
                 private$summary_stats()
+            if (success)
+                private$is_cleaned_up = TRUE
             success
         }
     ),
@@ -163,6 +165,7 @@ QSys = R6::R6Class("QSys",
         reuse = NULL,
         template = NULL,
         defaults = list(),
+        is_cleaned_up = FALSE,
 
         send = function(..., serialize=TRUE) {
             rzmq::send.socket(socket = private$socket,

diff --git a/R/qsys_lsf.r b/R/qsys_lsf.r
@@ -21,15 +21,10 @@ LSF = R6::R6Class("LSF",
             }
         },
 
-        cleanup = function(quiet=FALSE) {
-            success = super$cleanup(quiet=quiet)
-            self$finalize(success)
-        },
-
-        finalize = function(clean=FALSE) {
+        finalize = function() {
             if (!private$is_cleaned_up) {
                 system(paste("bkill -J", private$job_id),
-                       ignore.stdout=clean, ignore.stderr=clean)
+                       ignore.stdout=FALSE, ignore.stderr=clean)
                 private$is_cleaned_up = TRUE
             }
         }

diff --git a/R/qsys_sge.r b/R/qsys_sge.r
@@ -21,15 +21,10 @@ SGE = R6::R6Class("SGE",
             }
         },
 
-        cleanup = function(quiet=FALSE) {
-            success = super$cleanup(quiet=quiet)
-            self$finalize(success)
-        },
-
-        finalize = function(clean=FALSE) {
+        finalize = function() {
             if (!private$is_cleaned_up) {
                 system(paste("qdel", private$job_id),
-                       ignore.stdout=clean, ignore.stderr=clean)
+                       ignore.stdout=FALSE, ignore.stderr=clean)
                 private$is_cleaned_up = TRUE
             }
         }

diff --git a/R/qsys_slurm.r b/R/qsys_slurm.r
@@ -21,15 +21,10 @@ SLURM = R6::R6Class("SLURM",
             }
         },
 
-        cleanup = function(quiet=FALSE) {
-            success = super$cleanup(quiet=quiet)
-            self$finalize(success)
-        },
-
-        finalize = function(clean=FALSE) {
+        finalize = function() {
             if (!private$is_cleaned_up) {
                 system(paste("scancel --jobname", private$job_id),
-                       ignore.stdout=clean, ignore.stderr=clean)
+                       ignore.stdout=FALSE, ignore.stderr=clean)
                 private$is_cleaned_up = TRUE
             }
         }