Allow job prio overrides with job_name_in_configuration and class name (#4095)

Author: johha

app/jobs/enqueuer.rb

@@ -58,7 +58,7 @@ def job_timeout
       end
 
       def job_priority
-        @priority_overwriter.get(@job.try(:display_name))
+        @priority_overwriter.get(@job.try(:display_name)) || @priority_overwriter.get(@job.try(:job_name_in_configuration)) || @priority_overwriter.get(@job.class.name)
       end
 
       def run_immediately

lib/cloud_controller/job/job_priority_overwriter.rb

@@ -4,18 +4,18 @@ def initialize(config)
       @overwritten_job_priorities = config.get(:jobs, :priorities)
     end
 
-    def get(job_display_name)
-      return unless overwritten?(job_display_name)
+    def get(job_name)
+      return unless overwritten?(job_name)
 
-      @overwritten_job_priorities[job_display_name.to_sym]
+      @overwritten_job_priorities[job_name.to_sym]
     end
 
     private
 
-    def overwritten?(job_display_name)
-      return false if @overwritten_job_priorities.nil? || job_display_name.nil?
+    def overwritten?(job_name)
+      return false if @overwritten_job_priorities.nil? || job_name.nil?
 
-      @overwritten_job_priorities.key?(job_display_name.to_sym)
+      @overwritten_job_priorities.key?(job_name.to_sym)
     end
 
     attr_reader :config

spec/unit/jobs/enqueuer_spec.rb

@@ -145,15 +145,43 @@ module VCAP::CloudController::Jobs
       end
 
       context 'priority from config' do
-        let(:priorities) { { priorities: { wrapped_job.display_name.to_sym => 1899 } } }
+        context 'priority is configured via display_name' do
+          let(:priorities) { { priorities: { 'object.delete': 1899, delete_action_job: 1900, 'VCAP::CloudController::Jobs::DeleteActionJob': 1901 } } }
 
-        it 'uses the configured priority' do
-          original_enqueue = Delayed::Job.method(:enqueue)
-          expect(Delayed::Job).to receive(:enqueue) do |enqueued_job, opts|
-            expect(opts).to include({ priority: 1899 })
-            original_enqueue.call(enqueued_job, opts)
+          it 'uses the configured priority' do
+            original_enqueue = Delayed::Job.method(:enqueue)
+            expect(Delayed::Job).to receive(:enqueue) do |enqueued_job, opts|
+              expect(opts).to include({ priority: 1899 })
+              original_enqueue.call(enqueued_job, opts)
+            end
+            Enqueuer.new(wrapped_job, opts).enqueue_pollable
+          end
+        end
+
+        context 'priority is configured via job_name_in_configuration' do
+          let(:priorities) { { priorities: { delete_action_job: 1900, 'VCAP::CloudController::Jobs::DeleteActionJob': 1901 } } }
+
+          it 'uses the configured priority' do
+            original_enqueue = Delayed::Job.method(:enqueue)
+            expect(Delayed::Job).to receive(:enqueue) do |enqueued_job, opts|
+              expect(opts).to include({ priority: 1900 })
+              original_enqueue.call(enqueued_job, opts)
+            end
+            Enqueuer.new(wrapped_job, opts).enqueue_pollable
+          end
+        end
+
+        context 'priority is configured via class name' do
+          let(:priorities) { { priorities: { 'VCAP::CloudController::Jobs::DeleteActionJob': 1901 } } }
+
+          it 'uses the configured priority' do
+            original_enqueue = Delayed::Job.method(:enqueue)
+            expect(Delayed::Job).to receive(:enqueue) do |enqueued_job, opts|
+              expect(opts).to include({ priority: 1901 })
+              original_enqueue.call(enqueued_job, opts)
+            end
+            Enqueuer.new(wrapped_job, opts).enqueue_pollable
           end
-          Enqueuer.new(wrapped_job, opts).enqueue_pollable
         end
 
         context 'and priority from Enqueuer (e.g. from reoccurring jobs)' do