- 
                Notifications
    You must be signed in to change notification settings 
- Fork 205
Batch Support #142
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Open
      
      
            jpcamara
  wants to merge
  38
  commits into
  rails:main
  
    
      
        
          
  
    
      Choose a base branch
      
     
    
      
        
      
      
        
          
          
        
        
          
            
              
              
              
  
           
        
        
          
            
              
              
           
        
       
     
  
        
          
            
          
            
          
        
       
    
      
from
jpcamara:batch-poc
  
      
      
   
  
    
  
  
  
 
  
      
    base: main
Could not load branches
            
              
  
    Branch not found: {{ refName }}
  
            
                
      Loading
              
            Could not load tags
            
            
              Nothing to show
            
              
  
            
                
      Loading
              
            Are you sure you want to change the base?
            Some commits from the old base branch may be removed from the timeline,
            and old review comments may become outdated.
          
          
  
     Open
                    Batch Support #142
Changes from all commits
      Commits
    
    
            Show all changes
          
          
            38 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      f299e7f
              
                Batch job POC
              
              
                jpcamara cff6960
              
                Use ActiveSupport::IsolatedExecutionState to honor user isolation lev…
              
              
                jpcamara bfb3d46
              
                Ability to retrieve batch from a job
              
              
                jpcamara 49e8efa
              
                Allow batch jobs to be instances
              
              
                jpcamara 3ab68d9
              
                Use text so the jobs store properly on mysql
              
              
                jpcamara 6e8a011
              
                Handle on_failure and on_success
              
              
                jpcamara 4231b22
              
                Allow enqueueing into a batch instance
              
              
                jpcamara 16c4908
              
                Block enqueueing if the batch is finished
              
              
                jpcamara 88a2af9
              
                Migration to allow nesting batches
              
              
                jpcamara 1e0a3b3
              
                Expanded batch readme
              
              
                jpcamara 27015ea
              
                Force an initial batch check
              
              
                jpcamara 44fc038
              
                Initial batch lifecycle tests
              
              
                jpcamara 16a6ab5
              
                Add job batches to queue_schema.rb as well
              
              
                jpcamara 267582f
              
                Refactor internals and api namespace of batches
              
              
                jpcamara bbba7c6
              
                Move away from a batch_processed_at to batch_execution model
              
              
                jpcamara 5f795ec
              
                Reduce complexity of batches implementation
              
              
                jpcamara 159d941
              
                Test updates
              
              
                jpcamara 70184ef
              
                Create batch executions alongside ready and scheduled executions
              
              
                jpcamara 66518da
              
                Leftover from previous implementation
              
              
                jpcamara ba2c361
              
                Move batch completion checks to job
              
              
                jpcamara 2c97e16
              
                Support rails versions that don't have after_all_transactions_commit
              
              
                jpcamara c077303
              
                Remove support for nested batches for now
              
              
                jpcamara 7068791
              
                Fix starting batch in rails 7.1
              
              
                jpcamara 3a1f98f
              
                Helper status method
              
              
                jpcamara 80d73dd
              
                Remove parent/child batch relationship, which simplifies the logic
              
              
                jpcamara 4570cdf
              
                Performance improvements
              
              
                jpcamara 96fe4be
              
                We no longer need to keep jobs
              
              
                jpcamara 8dd6024
              
                Removing pending_jobs column
              
              
                jpcamara 9678759
              
                Update doc to reflect current feature state
              
              
                jpcamara 8db86aa
              
                We always save the batch first now, so we don't need to upsert
              
              
                jpcamara 5d233a2
              
                Rubocop
              
              
                jpcamara 1bbf9a5
              
                Accidental claude.md
              
              
                jpcamara a10904f
              
                Allow omitting a block, which will just enqueue an empty job
              
              
                jpcamara 230563e
              
                Switch batch_id to active_job_batch_id
              
              
                jpcamara 54476e6
              
                Make it so metadata is more ergonomic to include
              
              
                jpcamara 23d5a28
              
                Bad query field
              
              
                jpcamara 7744c4d
              
                Update metadata interface
              
              
                jpcamara de43454
              
                Give more breathing room for CI test runs
              
              
                jpcamara File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| # frozen_string_literal: true | ||
|  | ||
| module SolidQueue | ||
| class Batch | ||
| class EmptyJob < (defined?(ApplicationJob) ? ApplicationJob : ActiveJob::Base) | ||
| def perform | ||
| # This job does nothing - it just exists to trigger batch completion | ||
| # The batch completion will be handled by the normal job_finished! flow | ||
| end | ||
| end | ||
| end | ||
| end | 
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| # frozen_string_literal: true | ||
|  | ||
| module SolidQueue | ||
| class Batch < Record | ||
| include Trackable | ||
|  | ||
| has_many :jobs | ||
| has_many :batch_executions, class_name: "SolidQueue::BatchExecution", dependent: :destroy | ||
|  | ||
| serialize :on_finish, coder: JSON | ||
| serialize :on_success, coder: JSON | ||
| serialize :on_failure, coder: JSON | ||
| serialize :metadata, coder: JSON | ||
|  | ||
| after_initialize :set_active_job_batch_id | ||
| after_commit :start_batch, on: :create, unless: -> { ActiveRecord.respond_to?(:after_all_transactions_commit) } | ||
|  | ||
| mattr_accessor :maintenance_queue_name | ||
| self.maintenance_queue_name = "default" | ||
|  | ||
| def enqueue(&block) | ||
| raise "You cannot enqueue a batch that is already finished" if finished? | ||
|  | ||
| transaction do | ||
| save! if new_record? | ||
|  | ||
| Batch.wrap_in_batch_context(id) do | ||
| block&.call(self) | ||
| end | ||
|  | ||
| if ActiveRecord.respond_to?(:after_all_transactions_commit) | ||
| ActiveRecord.after_all_transactions_commit do | ||
| start_batch | ||
| end | ||
| end | ||
| end | ||
| end | ||
|  | ||
| def on_success=(value) | ||
| super(serialize_callback(value)) | ||
| end | ||
|  | ||
| def on_failure=(value) | ||
| super(serialize_callback(value)) | ||
| end | ||
|  | ||
| def on_finish=(value) | ||
| super(serialize_callback(value)) | ||
| end | ||
|  | ||
| def metadata | ||
| (super || {}).with_indifferent_access | ||
| end | ||
|  | ||
| def check_completion! | ||
| return if finished? || !ready? | ||
| return if batch_executions.limit(1).exists? | ||
|  | ||
| rows = Batch | ||
| .where(id: id) | ||
| .unfinished | ||
| .empty_executions | ||
| .update_all(finished_at: Time.current) | ||
|  | ||
| return if rows.zero? | ||
|  | ||
| with_lock do | ||
| failed = jobs.joins(:failed_execution).count | ||
| finished_attributes = {} | ||
| if failed > 0 | ||
| finished_attributes[:failed_at] = Time.current | ||
| finished_attributes[:failed_jobs] = failed | ||
| end | ||
| finished_attributes[:completed_jobs] = total_jobs - failed | ||
|  | ||
| update!(finished_attributes) | ||
| execute_callbacks | ||
| end | ||
| end | ||
|  | ||
| private | ||
|  | ||
| def set_active_job_batch_id | ||
| self.active_job_batch_id ||= SecureRandom.uuid | ||
| end | ||
|  | ||
| def as_active_job(active_job_klass) | ||
| active_job_klass.is_a?(ActiveJob::Base) ? active_job_klass : active_job_klass.new | ||
| end | ||
|  | ||
| def serialize_callback(value) | ||
| return value if value.blank? | ||
| active_job = as_active_job(value) | ||
| # We can pick up batch ids from context, but callbacks should never be considered a part of the batch | ||
| active_job.batch_id = nil | ||
| active_job.serialize | ||
| end | ||
|  | ||
| def perform_completion_job(job_field, attrs) | ||
| active_job = ActiveJob::Base.deserialize(send(job_field)) | ||
| active_job.send(:deserialize_arguments_if_needed) | ||
| active_job.arguments = [ self ] + Array.wrap(active_job.arguments) | ||
| SolidQueue::Job.enqueue_all([ active_job ]) | ||
|  | ||
| active_job.provider_job_id = Job.find_by(active_job_id: active_job.job_id).id | ||
| attrs[job_field] = active_job.serialize | ||
| end | ||
|  | ||
| def execute_callbacks | ||
| if failed_at? | ||
| perform_completion_job(:on_failure, {}) if on_failure.present? | ||
| else | ||
| perform_completion_job(:on_success, {}) if on_success.present? | ||
| end | ||
|  | ||
| perform_completion_job(:on_finish, {}) if on_finish.present? | ||
| end | ||
|  | ||
| def enqueue_empty_job | ||
| Batch.wrap_in_batch_context(id) do | ||
| EmptyJob.set(queue: self.class.maintenance_queue_name || "default").perform_later | ||
| end | ||
| end | ||
|  | ||
| def start_batch | ||
| enqueue_empty_job if reload.total_jobs == 0 | ||
| update!(enqueued_at: Time.current) | ||
| end | ||
|  | ||
| class << self | ||
| def enqueue(on_success: nil, on_failure: nil, on_finish: nil, **metadata, &block) | ||
| new.tap do |batch| | ||
| batch.assign_attributes( | ||
| on_success: on_success, | ||
| on_failure: on_failure, | ||
| on_finish: on_finish, | ||
| metadata: metadata | ||
| ) | ||
|  | ||
| batch.enqueue(&block) | ||
| end | ||
| end | ||
|  | ||
| def current_batch_id | ||
| ActiveSupport::IsolatedExecutionState[:current_batch_id] | ||
| end | ||
|  | ||
| def wrap_in_batch_context(batch_id) | ||
| previous_batch_id = current_batch_id.presence || nil | ||
| ActiveSupport::IsolatedExecutionState[:current_batch_id] = batch_id | ||
| yield | ||
| ensure | ||
| ActiveSupport::IsolatedExecutionState[:current_batch_id] = previous_batch_id | ||
| end | ||
| end | ||
| end | ||
| end | ||
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # frozen_string_literal: true | ||
|  | ||
| module SolidQueue | ||
| class Batch | ||
| module Trackable | ||
| extend ActiveSupport::Concern | ||
|  | ||
| included do | ||
| scope :finished, -> { where.not(finished_at: nil) } | ||
| scope :succeeded, -> { finished.where(failed_at: nil) } | ||
| scope :unfinished, -> { where(finished_at: nil) } | ||
| scope :failed, -> { where.not(failed_at: nil) } | ||
| scope :empty_executions, -> { | ||
| where(<<~SQL) | ||
| NOT EXISTS ( | ||
| SELECT 1 FROM solid_queue_batch_executions | ||
| WHERE solid_queue_batch_executions.batch_id = solid_queue_batches.id | ||
| LIMIT 1 | ||
| ) | ||
| SQL | ||
| } | ||
| end | ||
|  | ||
| def status | ||
| if finished? | ||
| failed? ? "failed" : "completed" | ||
| elsif enqueued_at.present? | ||
| "processing" | ||
| else | ||
| "pending" | ||
| end | ||
| end | ||
|  | ||
| def failed? | ||
| failed_at.present? | ||
| end | ||
|  | ||
| def succeeded? | ||
| finished? && !failed? | ||
| end | ||
|  | ||
| def finished? | ||
| finished_at.present? | ||
| end | ||
|  | ||
| def ready? | ||
| enqueued_at.present? | ||
| end | ||
|  | ||
| def completed_jobs | ||
| finished? ? self[:completed_jobs] : total_jobs - batch_executions.count | ||
| end | ||
|  | ||
| def failed_jobs | ||
| finished? ? self[:failed_jobs] : jobs.joins(:failed_execution).count | ||
| end | ||
|  | ||
| def pending_jobs | ||
| finished? ? 0 : batch_executions.count | ||
| end | ||
|  | ||
| def progress_percentage | ||
| return 0 if total_jobs == 0 | ||
| ((completed_jobs + failed_jobs) * 100.0 / total_jobs).round(2) | ||
| end | ||
| end | ||
| end | ||
| end | 
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # frozen_string_literal: true | ||
|  | ||
| module SolidQueue | ||
| class BatchExecution < Record | ||
| belongs_to :job, optional: true | ||
| belongs_to :batch | ||
|  | ||
| after_commit :check_completion, on: :destroy | ||
|  | ||
| private | ||
| def check_completion | ||
| batch = Batch.find_by(id: batch_id) | ||
| batch.check_completion! if batch.present? | ||
| end | ||
|  | ||
| class << self | ||
| def create_all_from_jobs(jobs) | ||
| batch_jobs = jobs.select { |job| job.batch_id.present? } | ||
| return if batch_jobs.empty? | ||
|  | ||
| batch_jobs.group_by(&:batch_id).each do |batch_id, jobs| | ||
| BatchExecution.insert_all!(jobs.map { |job| | ||
| { batch_id:, job_id: job.respond_to?(:provider_job_id) ? job.provider_job_id : job.id } | ||
| }) | ||
|  | ||
| total = jobs.size | ||
| SolidQueue::Batch.where(id: batch_id).update_all([ "total_jobs = total_jobs + ?", total ]) | ||
| end | ||
| end | ||
| end | ||
| end | ||
| end | 
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # frozen_string_literal: true | ||
|  | ||
| module SolidQueue | ||
| class Execution | ||
| module Batchable | ||
| extend ActiveSupport::Concern | ||
|  | ||
| included do | ||
| after_create :update_batch_progress, if: -> { job.batch_id? } | ||
| end | ||
|  | ||
| private | ||
| def update_batch_progress | ||
| if is_a?(FailedExecution) | ||
| # FailedExecutions are only created when the job is done retrying | ||
| job.batch_execution&.destroy! | ||
| end | ||
| rescue => e | ||
| Rails.logger.error "[SolidQueue] Failed to notify batch #{job.batch_id} about job #{job.id} failure: #{e.message}" | ||
| end | ||
| end | ||
| end | ||
| end | 
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
      
      Oops, something went wrong.
        
    
  
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are a couple places that use
after_commits (or just do things after all transactions have committed usingActiveRecord.after_all_transactions_commit), which means they are susceptible to intermitten errors causing them to never fire. Ideally I would update the concurrency maintenance task to also manage checking that batches actually initialize properly. But I didn't want to add anything like that until I get an overall ok about the PRs approach.