Keep the original job object when using retry_job

When the job is retried, we want to preserve the original
`scheduled_at`, `queue_name` and `priority`. Instead of using `dup`,
this copies and restores the necessary attributes.

Author: etiennebarrie

activejob/lib/active_job/exceptions.rb

@@ -157,8 +157,10 @@ def after_discard(&blk)
     #  end
     def retry_job(options = {})
       instrument :enqueue_retry, options.slice(:error, :wait) do
-        job = dup
-        job.enqueue options
+        scheduled_at, queue_name, priority = self.scheduled_at, self.queue_name, self.priority
+        enqueue options
+      ensure
+        self.scheduled_at, self.queue_name, self.priority = scheduled_at, queue_name, priority
       end
     end
 

activejob/test/cases/exceptions_test.rb

@@ -2,6 +2,7 @@
 
 require "helper"
 require "jobs/retry_job"
+require "jobs/retries_job"
 require "jobs/after_discard_retry_job"
 require "models/person"
 require "minitest/mock"
@@ -343,6 +344,13 @@ def adapter_skips_scheduling?(queue_adapter)
       assert_equal ["Raised DefaultsError for the 5th time"], JobBuffer.values
     end
 
+    test "retrying a job when before_enqueue raised uses the same job object" do
+      job = RetriesJob.new
+      assert_nothing_raised do
+        job.enqueue
+      end
+    end
+
     test "retrying a job reports error when report: true" do
       assert_error_reported(ReportedError) do
         RetryJob.perform_later("ReportedError", 2)

activejob/test/jobs/retries_job.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class BeforeEnqueueError < StandardError; end
+
+class RetriesJob < ActiveJob::Base
+  attr_accessor :raise_before_enqueue
+
+  # The job fails in before_enqueue the first time it retries itself.
+  before_perform do
+    self.raise_before_enqueue = true
+  end
+
+  # The job fails once to enqueue/retry itself, then succeeds.
+  before_enqueue do
+    raise BeforeEnqueueError if raise_before_enqueue
+  ensure
+    @raise_before_enqueue = false
+  end
+
+  # The job retries on BeforeEnqueueError errors.
+  retry_on BeforeEnqueueError
+
+  def perform
+    retry_job if executions <= 1
+  end
+end