solid_queue 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eb31439e2768af5f5d3fb9289ac51056570c762ad140bc54aba81ee770d5a12
-  data.tar.gz: 4d3e4c2608b0a3ed2de82c7712c8a524e8745bc4e2ddf6907de8b3723560ab04
+  metadata.gz: d907fb9133f2c72a61b586038f05b248a29e7c55f506aa541ca39f35a15d40ff
+  data.tar.gz: 887ecd7d0a15159ae10845466993699165a531367dbb21151e3ae704e56fa8e9
 SHA512:
-  metadata.gz: 0f4271aaf7b55b86d81f97bf19bbfa2b76de1ff994a6b71bb097b89ab9585212f28c0fdbd4fbb86b74c18b49cf229e7913eaa724784b3a62f000d60c2ade3263
-  data.tar.gz: a84d91b13db4a3ec96d1afa5fb5f39abc9ea0bf4bc216c14e20f4bf7e1bf2ff414e08f78166377950351b8170cbd734aa69322feb9076a67a3f9939ebacf6573
+  metadata.gz: 665bb353c9cc8c557952ca5e2f63120b0541eef7a20008b6c288147e0350564200be2e6272f9924448867b9b2d09a7e48dc5b2267ec35b91f5dcd38bc409fff1
+  data.tar.gz: 9e911e1a270b5da57f75011e40ad6949480a8b87a2eb391934697159701273e1f05da9ac5c114e8d9dac492bb7685f6884eacac592ed44a460f513fd7349f85a

data/README.md

@@ -142,6 +142,7 @@ When receiving a `QUIT` signal, if workers still have jobs in-flight, these will
 If processes have no chance of cleaning up before exiting (e.g. if someone pulls a cable somewhere), in-flight jobs might remain claimed by the processes executing them. Processes send heartbeats, and the supervisor checks and prunes processes with expired heartbeats, which will release any claimed jobs back to their queues. You can configure both the frequency of heartbeats and the threshold to consider a process dead. See the section below for this.
 
 ### Other configuration settings
+_Note_: The settings in this section should be set in your `config/application.rb` or your environment config like this: `config.solid_queue.silence_polling = true`
 
 There are several settings that control how Solid Queue works that you can set as well:
 - `logger`: the logger you want Solid Queue to use. Defaults to the app logger.
@@ -161,7 +162,7 @@ There are several settings that control how Solid Queue works that you can set a
 - `process_heartbeat_interval`: the heartbeat interval that all processes will follow—defaults to 60 seconds.
 - `process_alive_threshold`: how long to wait until a process is considered dead after its last heartbeat—defaults to 5 minutes.
 - `shutdown_timeout`: time the supervisor will wait since it sent the `TERM` signal to its supervised processes before sending a `QUIT` version to them requesting immediate termination—defaults to 5 seconds.
-- `silence_polling`: whether to silence Active Record logs emitted when polling for both workers and dispatchers—defaults to `false`.
+- `silence_polling`: whether to silence Active Record logs emitted when polling for both workers and dispatchers—defaults to `true`.
 - `supervisor_pidfile`: path to a pidfile that the supervisor will create when booting to prevent running more than one supervisor in the same host, or in case you want to use it for a health check. It's `nil` by default.
 - `preserve_finished_jobs`: whether to keep finished jobs in the `solid_queue_jobs` table—defaults to `true`.
 - `clear_finished_jobs_after`: period to keep finished jobs around, in case `preserve_finished_jobs` is true—defaults to 1 day. **Note:** Right now, there's no automatic cleanup of finished jobs. You'd need to do this by periodically invoking `SolidQueue::Job.clear_finished_in_batches`, but this will happen automatically in the near future.
@@ -228,8 +229,7 @@ failed_execution.retry # This will re-enqueue the job as if it was enqueued for
 failed_execution.discard # This will delete the job from the system
 ```
 
-We're planning to release a dashboard called _Mission Control_, where, among other things, you'll be able to examine and retry/discard failed jobs, one by one, or in bulk.
-
+However, we recommend taking a look at [mission_control-jobs](https://github.com/basecamp/mission_control-jobs), a dashboard where, among other things, you can examine and retry/discard failed jobs. 
 
 ## Puma plugin
 We provide a Puma plugin if you want to run the Solid Queue's supervisor together with Puma and have Puma monitor and manage it. You just need to add

data/app/models/solid_queue/blocked_execution.rb

@@ -30,10 +30,10 @@ module SolidQueue
 
       private
         def releasable(concurrency_keys)
-          semaphores = Semaphore.where(key: concurrency_keys).select(:key, :value).index_by(&:key)
+          semaphores = Semaphore.where(key: concurrency_keys).pluck(:key, :value).to_h
 
           # Concurrency keys without semaphore + concurrency keys with open semaphore
-          (concurrency_keys - semaphores.keys) | semaphores.select { |key, semaphore| semaphore.value > 0 }.map(&:first)
+          (concurrency_keys - semaphores.keys) | semaphores.select { |_key, value| value > 0 }.keys
         end
     end
 

data/app/models/solid_queue/execution/dispatching.rb

@@ -10,7 +10,7 @@ module SolidQueue
           jobs = Job.where(id: job_ids)
 
           Job.dispatch_all(jobs).map(&:id).tap do |dispatched_job_ids|
-            where(job_id: dispatched_job_ids).delete_all
+            where(job_id: dispatched_job_ids).order(:job_id).delete_all
             SolidQueue.logger.info("[SolidQueue] Dispatched #{dispatched_job_ids.size} jobs")
           end
         end

data/app/models/solid_queue/scheduled_execution.rb

@@ -5,7 +5,7 @@ module SolidQueue
     include Dispatching
 
     scope :due, -> { where(scheduled_at: ..Time.current) }
-    scope :ordered, -> { order(scheduled_at: :asc, priority: :asc) }
+    scope :ordered, -> { order(scheduled_at: :asc, priority: :asc, job_id: :asc) }
     scope :next_batch, ->(batch_size) { due.ordered.limit(batch_size) }
 
     assumes_attributes_from_job :scheduled_at

data/app/models/solid_queue/semaphore.rb

@@ -26,7 +26,6 @@ module SolidQueue
 
       def initialize(job)
         @job = job
-        @retries = 0
       end
 
       def wait
@@ -42,42 +41,26 @@ module SolidQueue
       end
 
       private
-        attr_accessor :job, :retries
+        attr_accessor :job
 
         def attempt_creation
           Semaphore.create!(key: key, value: limit - 1, expires_at: expires_at)
           true
         rescue ActiveRecord::RecordNotUnique
-          attempt_decrement
+          if limit == 1 then false
+          else
+            attempt_decrement
+          end
         end
 
         def attempt_decrement
           Semaphore.available.where(key: key).update_all([ "value = value - 1, expires_at = ?", expires_at ]) > 0
-        rescue ActiveRecord::Deadlocked
-          if retriable? then attempt_retry
-          else
-            raise
-          end
         end
 
         def attempt_increment
           Semaphore.where(key: key, value: ...limit).update_all([ "value = value + 1, expires_at = ?", expires_at ]) > 0
         end
 
-        def attempt_retry
-          self.retries += 1
-
-          if semaphore = Semaphore.find_by(key: key)
-            semaphore.value > 0 && attempt_decrement
-          end
-        end
-
-        MAX_RETRIES = 1
-
-        def retriable?
-          retries < MAX_RETRIES
-        end
-
         def key
           job.concurrency_key
         end

data/lib/solid_queue/processes/registrable.rb

@@ -55,7 +55,7 @@ module SolidQueue::Processes
       end
 
       def hostname
-        @hostname ||= Socket.gethostname
+        @hostname ||= Socket.gethostname.force_encoding(Encoding::UTF_8)
       end
 
       def process_pid

data/lib/solid_queue/version.rb

@@ -1,3 +1,3 @@
 module SolidQueue
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/solid_queue.rb

@@ -33,7 +33,7 @@ module SolidQueue
 
   mattr_accessor :shutdown_timeout, default: 5.seconds
 
-  mattr_accessor :silence_polling, default: false
+  mattr_accessor :silence_polling, default: true
 
   mattr_accessor :supervisor_pidfile
   mattr_accessor :supervisor, default: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Rosa Gutierrez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,7 +101,6 @@ files:
 - db/migrate/20240110143450_add_missing_index_to_blocked_executions.rb
 - lib/active_job/concurrency_controls.rb
 - lib/active_job/queue_adapters/solid_queue_adapter.rb
-- lib/active_job/uniqueness.rb
 - lib/generators/solid_queue/install/USAGE
 - lib/generators/solid_queue/install/install_generator.rb
 - lib/generators/solid_queue/install/templates/config.yml
@@ -110,7 +109,6 @@ files:
 - lib/solid_queue/app_executor.rb
 - lib/solid_queue/configuration.rb
 - lib/solid_queue/dispatcher.rb
-- lib/solid_queue/dispatcher/scheduled_executions_dispatcher.rb
 - lib/solid_queue/engine.rb
 - lib/solid_queue/pool.rb
 - lib/solid_queue/processes/base.rb
@@ -126,12 +124,12 @@ files:
 - lib/solid_queue/tasks.rb
 - lib/solid_queue/version.rb
 - lib/solid_queue/worker.rb
-homepage: http://github.com/basecamp/solid_queue
+homepage: https://github.com/basecamp/solid_queue
 licenses:
 - MIT
 metadata:
-  homepage_uri: http://github.com/basecamp/solid_queue
-  source_code_uri: http://github.com/basecamp/solid_queue
+  homepage_uri: https://github.com/basecamp/solid_queue
+  source_code_uri: https://github.com/basecamp/solid_queue
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/active_job/uniqueness.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveJob
-  module Uniqueness
-    extend ActiveSupport::Concern
-
-    DEFAULT_UNIQUENESS_GROUP = ->(*) { self.class.name }
-
-    included do
-      class_attribute :uniqueness_key, instance_accessor: false
-      class_attribute :uniqueness_group, default: DEFAULT_UNIQUENESS_GROUP, instance_accessor: false
-
-      class_attribute :uniqueness_duration
-    end
-
-    class_methods do
-      def enqueued_uniquely_by(key:, group: DEFAULT_UNIQUENESS_GROUP, duration: SolidQueue.default_uniqueness_period)
-        self.uniqueness_key = key
-        self.uniqueness_group = group
-        self.uniqueness_duration = duration
-      end
-    end
-
-    def uniqueness_key
-      if self.class.uniqueness_key
-        param = compute_concurrency_parameter(self.class.concurrency_key)
-
-        case param
-        when ActiveRecord::Base
-          [ concurrency_group, param.class.name, param.id ]
-        else
-          [ concurrency_group, param ]
-        end.compact.join("/")
-      end
-    end
-
-    def enqueued_uniquely?
-      uniqueness_key.present?
-    end
-  end
-end

data/lib/solid_queue/dispatcher/scheduled_executions_dispatcher.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module SolidQueue
-  class Dispatcher::ScheduledExecutionsDispatcher < Dispatcher
-  end
-end