Refactor submission processor

Author: nygrenh

app/background_tasks/submission_long_queue_processor_task.rb

@@ -2,6 +2,9 @@
 
 require 'submission_processor'
 
+# In case submission processor task fails, this task will help with sending
+# submissions to sandbox. This task uses reverse order in order to avoid
+# sending the same submission to sandbox multiple times
 class SubmissionLongQueueProcessorTask
   def initialize
     @processor = SubmissionProcessor.new

app/background_tasks/submission_reprocessor_task.rb renamed to app/background_tasks/submission_processor_task.rb

@@ -2,13 +2,13 @@
 
 require 'submission_processor'
 
-class SubmissionReprocessorTask
+class SubmissionProcessorTask
   def initialize
     @processor = SubmissionProcessor.new
   end
 
   def run
-    @processor.reprocess_timed_out_submissions
+    @processor.process_some_submissions
   end
 
   def wait_delay

lib/submission_processor.rb

@@ -14,15 +14,15 @@ def process_submission(submission)
       submission.processing_began_at = Time.now
       submission.times_sent_to_sandbox += 1
       submission.save!
+      Rails.logger.info "Submission #{submission.id} sent to sandbox."
     end
   end
 
   # Called periodically by script/background_daemon.
-  # It tries to resend submissions to a sandbox if enough time has passed
-  # since the last attempt.
-  def reprocess_timed_out_submissions
-    Submission.to_be_reprocessed.limit([RemoteSandbox.total_capacity, 2].min).each do |submission|
-      Rails.logger.info "Attempting to reprocess submission #{submission.id}"
+  # It tries to send submissions to a sandbox
+  def process_some_submissions
+    Submission.to_be_reprocessed.limit(2).each do |submission|
+      Rails.logger.info "Attempting to process submission #{submission.id}"
 
       if submission.times_sent_to_sandbox < Submission.max_attempts_at_processing
         process_submission(submission)

spec/integration/admin_usecases_spec.rb

@@ -53,7 +53,7 @@
 
     click_button 'Rerun submission'
     expect(page).to have_content('Rerun scheduled')
-    SubmissionProcessor.new.reprocess_timed_out_submissions
+    SubmissionProcessor.new.process_some_submissions
     wait_for_submission_to_be_processed
 
     expect(page).not_to have_content('some funny error')

spec/lib/submission_processor_spec.rb

@@ -20,22 +20,22 @@ def expect_no_processing
       @sub.processing_tried_at = Time.now - Submission.processing_retry_interval - 1.second
       @sub.save!
       expect_processing
-      SubmissionProcessor.new.reprocess_timed_out_submissions
+      SubmissionProcessor.new.process_some_submissions
     end
 
     it 'should not reprocess when processing was just attempted' do
       @sub.processing_tried_at = Time.now
       @sub.save!
       expect_no_processing
-      SubmissionProcessor.new.reprocess_timed_out_submissions
+      SubmissionProcessor.new.process_some_submissions
     end
 
     it 'should reprocess even if a sandbox has received the job a long time ago' do
       @sub.processing_tried_at = Time.now - Submission.processing_retry_interval - 1.second
       @sub.processing_began_at = Time.now - Submission.processing_resend_interval - 1.second
       @sub.save!
       expect_processing
-      SubmissionProcessor.new.reprocess_timed_out_submissions
+      SubmissionProcessor.new.process_some_submissions
     end
 
     it 'should not reprocess when a sandbox has received the job a reasonable time ago' do
@@ -44,7 +44,7 @@ def expect_no_processing
       expect(@sub.processing_began_at).to be < @sub.processing_tried_at
       @sub.save!
       expect_no_processing
-      SubmissionProcessor.new.reprocess_timed_out_submissions
+      SubmissionProcessor.new.process_some_submissions
     end
 
     context 'when the submission has been reprocessed too many times' do
@@ -55,12 +55,12 @@ def expect_no_processing
 
       it 'should not reprocess it any more' do
         expect_no_processing
-        SubmissionProcessor.new.reprocess_timed_out_submissions
+        SubmissionProcessor.new.process_some_submissions
       end
 
       it 'should mark it as processed and having an error' do
         user = FactoryGirl.create :user
-        SubmissionProcessor.new.reprocess_timed_out_submissions
+        SubmissionProcessor.new.process_some_submissions
         @sub.reload
         expect(@sub).to be_processed
         expect(@sub.pretest_error).not_to be_empty
@@ -78,13 +78,13 @@ def expect_no_processing
         original_count = Submission.max_attempts_at_processing - 1
         @sub.times_sent_to_sandbox = original_count
         @sub.save!
-        SubmissionProcessor.new.reprocess_timed_out_submissions
+        SubmissionProcessor.new.process_some_submissions
         @sub.reload
         expect(@sub.times_sent_to_sandbox).to eq(original_count + 1)
       end
 
       it 'should update the processing_tried_at and processing_began_at timestamps' do
-        SubmissionProcessor.new.reprocess_timed_out_submissions
+        SubmissionProcessor.new.process_some_submissions
         @sub.reload
         expect(@sub.processing_tried_at).to be > Time.now - 5.seconds
         expect(@sub.processing_began_at).to be > Time.now - 5.seconds
@@ -100,13 +100,13 @@ def expect_no_processing
         original_count = Submission.max_attempts_at_processing - 1
         @sub.times_sent_to_sandbox = original_count
         @sub.save!
-        SubmissionProcessor.new.reprocess_timed_out_submissions
+        SubmissionProcessor.new.process_some_submissions
         @sub.reload
         expect(@sub.times_sent_to_sandbox).to eq(original_count)
       end
 
       it 'should update the processing_tried_at timestamp but not processing_began_at' do
-        SubmissionProcessor.new.reprocess_timed_out_submissions
+        SubmissionProcessor.new.process_some_submissions
         @sub.reload
         expect(@sub.processing_tried_at).to be > Time.now - 5.seconds
         expect(@sub.processing_began_at).to be_nil