Unschedule removed RecurringTask

Author: cupatea

lib/solid_queue/scheduler.rb

@@ -30,8 +30,8 @@ def run
         loop do
           break if shutting_down?
 
-          recurring_schedule.schedule_new_dynamic_tasks.tap do |new_tasks|
-            if new_tasks.any?
+          recurring_schedule.update_scheduled_tasks.tap do |updated_tasks|
+            if updated_tasks.any?
               process.update_columns(metadata: metadata.compact)
             end
           end

lib/solid_queue/scheduler/recurring_schedule.rb

@@ -37,6 +37,17 @@ def schedule_new_dynamic_tasks
       end
     end
 
+    def unschedule_old_dynamic_tasks
+      (scheduled_tasks.keys - SolidQueue::RecurringTask.pluck(:key)).each do |key|
+        scheduled_tasks[key].cancel
+        scheduled_tasks.delete(key)
+      end
+    end
+
+    def update_scheduled_tasks
+      schedule_new_dynamic_tasks + unschedule_old_dynamic_tasks
+    end
+
     def schedule_task(task)
       scheduled_tasks[task.key] = schedule(task)
     end

test/unit/scheduler_test.rb

@@ -71,7 +71,7 @@ class SchedulerTest < ActiveSupport::TestCase
 
   test "updates metadata after adding dynamic task post-start" do
     scheduler = SolidQueue::Scheduler.new(recurring_tasks: {}).tap do |s|
-      s.define_singleton_method(:interruptible_sleep) { |interval| } # avoid real sleeping
+      s.define_singleton_method(:interruptible_sleep) { |interval| sleep 0.1 }
       s.start
     end
 
@@ -99,4 +99,36 @@ class SchedulerTest < ActiveSupport::TestCase
   ensure
     scheduler&.stop
   end
+
+  test "updates metadata after removing dynamic task post-start" do
+    old_dynamic_task = SolidQueue::RecurringTask.create(
+      key:       "old_dynamic_task",
+      static:    false,
+      class_name: "AddToBufferJob",
+      schedule:  "every second",
+      arguments: [ 42 ]
+    )
+
+    scheduler = SolidQueue::Scheduler.new(recurring_tasks: {}).tap do |s|
+      s.define_singleton_method(:interruptible_sleep) { |interval| sleep 0.1 }
+      s.start
+    end
+
+    wait_for_registered_processes(1, timeout: 1.second)
+
+    process = SolidQueue::Process.first
+    # initially there is one recurring_schedule key
+    assert_metadata process, recurring_schedule: [ "old_dynamic_task" ]
+
+    old_dynamic_task.destroy
+
+    sleep 1
+
+    process.reload
+
+    # The task is unschedule after it's being removed, and it's reflected in the metadata
+    assert process.metadata, {}
+  ensure
+    scheduler&.stop
+  end
 end