Fix #1055

ropensci · Aug 22, 2023 · 1d1c1d8 · 1d1c1d8
1 parent 4cb6364
commit 1d1c1d8
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/R/class_active.R b/R/class_active.R
@@ -74,14 +74,24 @@ active_class <- R6::R6Class(
       self$meta$database$dequeue_rows()
       self$scheduler$progress$database$dequeue_rows()
     },
-    poll_meta = function() {
+    dequeue_meta_time = function() {
       self$seconds_dequeued <- self$seconds_dequeued %|||% -Inf
       now <- time_seconds_local()
       if ((now - self$seconds_dequeued) > self$seconds_interval) {
         self$dequeue_meta()
         self$seconds_dequeued <- time_seconds_local()
       }
     },
+    dequeue_meta_file = function(target) {
+      settings <- .subset2(target, "settings")
+      format <- .subset2(settings, "format")
+      repository <- .subset2(settings, "repository")
+      dequeue <- (format == "file" || format == "file_fast") &&
+        (repository == "local")
+      if (dequeue) {
+        self$dequeue_meta()
+      }
+    },
     write_gitignore = function() {
       writeLines(
         c("*", "!.gitignore", "!meta", "meta/*", "!meta/meta"),
@@ -145,6 +155,7 @@ active_class <- R6::R6Class(
       target_debug(target)
       target_update_depend(target, self$pipeline, self$meta)
       if (target_should_run(target, self$meta)) {
+        self$dequeue_meta_file(target)
         self$run_target(name)
       } else {
         self$skip_target(target)

diff --git a/R/class_clustermq.R b/R/class_clustermq.R
@@ -233,7 +233,7 @@ clustermq_class <- R6::R6Class(
       self$scheduler$backoff$reset()
     },
     iterate = function() {
-      self$poll_meta()
+      self$dequeue_meta_time()
       message <- if_any(
         self$workers > 0L,
         self$worker_list$receive_data(),

diff --git a/R/class_crew.R b/R/class_crew.R
@@ -207,7 +207,7 @@ crew_class <- R6::R6Class(
       target_sync_file_meta(target, self$meta)
     },
     iterate = function() {
-      self$poll_meta()
+      self$dequeue_meta_time()
       queue <- self$scheduler$queue
       should_dequeue <- queue$should_dequeue()
       if (should_dequeue) {

diff --git a/R/class_future.R b/R/class_future.R
@@ -210,7 +210,7 @@ future_class <- R6::R6Class(
       lapply(names, self$process_worker)
     },
     iterate = function() {
-      self$poll_meta()
+      self$dequeue_meta_time()
       self$process_workers()
       self$try_submit(wait = TRUE)
     },

diff --git a/R/class_local.R b/R/class_local.R
@@ -71,7 +71,7 @@ local_class <- R6::R6Class(
       self$unload_transient()
     },
     process_next = function() {
-      self$poll_meta()
+      self$dequeue_meta_time()
       self$process_target(self$scheduler$queue$dequeue())
     },
     run = function() {