Reset workers deadline on instantiation

Shopify · Jun 29, 2023 · 3f76ba7 · 3f76ba7
1 parent ec8e65b
commit 3f76ba7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/pitchfork/shared_memory.rb b/lib/pitchfork/shared_memory.rb
@@ -36,11 +36,11 @@ def value=(value)
       end
     end
 
-    def mold_tick
+    def mold_deadline
       self[MOLD_TICK_OFFSET]
     end
 
-    def worker_tick(worker_nr)
+    def worker_deadline(worker_nr)
       self[WORKER_TICK_OFFSET + worker_nr]
     end
 

diff --git a/lib/pitchfork/worker.rb b/lib/pitchfork/worker.rb
@@ -24,7 +24,8 @@ def initialize(nr, pid: nil, generation: 0)
       @exiting = false
       @requests_count = 0
       if nr
-        @deadline_drop = SharedMemory.worker_tick(nr)
+        @deadline_drop = SharedMemory.worker_deadline(nr)
+        self.deadline = 0
       else
         promoted!
       end
@@ -92,7 +93,8 @@ def promote!
     def promoted!
       @mold = true
       @nr = nil
-      @deadline_drop = SharedMemory.mold_tick
+      @deadline_drop = SharedMemory.mold_deadline
+      self.deadline = 0
       self
     end