4 files changed, 23 insertions, 2 deletions
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index 1e03c27535..efe46ce5ab 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Enable class reloading prior to job dispatch, and ensure Active Record
+    connections are returned to the pool when jobs are run in separate threads.
+
+    *Matthew Draper*
+
 *   Tune the async adapter for low-footprint dev/test usage. Use a single
     thread pool for all queues and limit to 0 to #CPU total threads, down from
     2 to 10*#CPU per queue.
diff --git a/activejob/lib/active_job/callbacks.rb b/activejob/lib/active_job/callbacks.rb
index 2b6149e84e..a6591c6a05 100644
--- a/activejob/lib/active_job/callbacks.rb
+++ b/activejob/lib/active_job/callbacks.rb
@@ -17,6 +17,11 @@ module ActiveJob
     extend  ActiveSupport::Concern
     include ActiveSupport::Callbacks
 
+    class << self
+      include ActiveSupport::Callbacks
+      define_callbacks :execute
+    end
+
     included do
       define_callbacks :perform
       define_callbacks :enqueue
diff --git a/activejob/lib/active_job/execution.rb b/activejob/lib/active_job/execution.rb
index 79d232da4a..7c4151fc90 100644
--- a/activejob/lib/active_job/execution.rb
+++ b/activejob/lib/active_job/execution.rb
@@ -17,8 +17,10 @@ module ActiveJob
       end
 
       def execute(job_data) #:nodoc:
-        job = deserialize(job_data)
-        job.perform_now
+        ActiveJob::Callbacks.run_callbacks(:execute) do
+          job = deserialize(job_data)
+          job.perform_now
+        end
       end
     end
 
diff --git a/activejob/lib/active_job/railtie.rb b/activejob/lib/active_job/railtie.rb
index b249ec09dd..a47caa4a7e 100644
--- a/activejob/lib/active_job/railtie.rb
+++ b/activejob/lib/active_job/railtie.rb
@@ -19,5 +19,14 @@ module ActiveJob
       end
     end
 
+    initializer "active_job.set_reloader_hook" do |app|
+      ActiveSupport.on_load(:active_job) do
+        ActiveJob::Callbacks.singleton_class.set_callback(:execute, :around, prepend: true) do |_, inner|
+          app.reloader.wrap do
+            inner.call
+          end
+        end
+      end
+    end
   end
 end