Synchronize CapsuleTracker#renew (#1369)

app/models/good_job/process.rb

@@ -101,7 +101,8 @@ def self.process_state
 
     def refresh
       self.state = self.class.process_state
-      reload.update(state: state, updated_at: Time.current)
+      reload # verify the record still exists in the database
+      update(state: state, updated_at: Time.current)
     rescue ActiveRecord::RecordNotFound
       @new_record = true
       self.created_at = self.updated_at = nil

lib/good_job/capsule_tracker.rb

@@ -143,8 +143,10 @@ def unregister(with_advisory_lock: false)
     # @param silent [Boolean] Whether to silence logging.
     # @return [void]
     def renew(silent: false)
-      GoodJob::Process.with_logger_silenced(silent: silent) do
-        @record&.refresh_if_stale(cleanup: true)
+      synchronize do
+        GoodJob::Process.with_logger_silenced(silent: silent) do
+          @record&.refresh_if_stale(cleanup: true)
+        end
       end
     end
 

spec/lib/good_job/capsule_tracker_spec.rb

@@ -149,7 +149,7 @@
   end
 
   describe '#process_id' do
-    it 'is a UUID' do
+    it 'is a UUID the process has been locked' do
       expect(tracker.process_id).to be_a_uuid
     end
   end