sidekiq 7.2.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d69bb09eb124a8fd4710af9972bdb6a0cd74429bc3e61cdccdae683a4a0203
-  data.tar.gz: 8a37c7f172e4efabb061f980a73547d7245585574133b07d159f0412e49dd362
+  metadata.gz: 67dd3e4a49f94aa711fa9baa0caac22c992b5c0a6a04a1cade9426f9a4a9341b
+  data.tar.gz: 224649c4a61110b9600f70f3ccd568360642e74330fc7503f6ac03bc57f638dd
 SHA512:
-  metadata.gz: dbb63070d419ad3d2b8192b2864ff4608288c00fe51c7e79e4a3faafd33665cce0c92ece38f9cd2a30ae4b7ff7e66debaf894198b054b88c5d0b5d5ee3790153
-  data.tar.gz: 8ba7a30ebdd19734a7cc64031a6eb63e4f317de0ae652bed324c272fd57f422186add097b38ab88aaa2a0a925de6b0845d18739691cbd9e9f2e90f3d79bb9e0a
+  metadata.gz: 20154e18f4d51e19b68946543f4523ac452f463ef7b8f2e4445bdb1d2bf518902e94edefc9d2a4f5771c33bdc5003b5b4b55fab05495d7756f90ebdc0bfbe0b9
+  data.tar.gz: 510fa35d3b8657b1e8e6b23bc940d0a32ae64d0e09331981728b23ea1548d2b000f1943ee39b2b2459500d86c4b3a3cd9a8bf2142ebd82ecdbdbfac75a0d521f

data/Changes.md

@@ -2,6 +2,12 @@
 
 [Sidekiq Changes](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) | [Sidekiq Pro Changes](https://github.com/sidekiq/sidekiq/blob/main/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/sidekiq/sidekiq/blob/main/Ent-Changes.md)
 
+HEAD
+----------
+
+- Add `Process.warmup` call in Ruby 3.3+
+- Batch jobs now skip transactional push [#6160]
+
 7.2.1
 ----------
 

data/README.md

@@ -14,11 +14,11 @@ Rails to make background processing dead simple.
 Requirements
 -----------------
 
-- Redis: 6.2+
+- Redis: Redis 6.2+ or Dragonfly 1.13+
 - Ruby: MRI 2.7+ or JRuby 9.3+.
 
 Sidekiq 7.0 supports Rails 6.0+ but does not require it.
-
+As of 7.2, Sidekiq supports Dragonfly as an alternative to Redis for data storage.
 
 Installation
 -----------------

data/bin/multi_queue_bench

@@ -120,9 +120,12 @@ class Loader
     start = Time.now
     @iter.times do
       arr = Array.new(@count) { |idx| [idx] }
-      #always prepends by queue:: that's why we pass 'q1, q2 etc' instead of `queue::q1`
+      # Sidekiq always prepends "queue:" to the queue name,
+      # that's why we pass 'q1', 'q2', etc instead of 'queue:q1'
       Sidekiq::Client.push_bulk("class" => LoadWorker, "args" => arr, "queue" => queue)
+      $stdout.write "."
     end
+    puts "Done"
   end
 
   def monitor_single(queue)
@@ -176,7 +179,7 @@ class Loader
   end
 
   def run(queues, queue, monitor_all_queues)
-    #Sidekiq.logger.warn("Consuming from #{queue}")
+    Sidekiq.logger.warn("Consuming from #{queue}")
     if monitor_all_queues
       monitor_all(queues)
     else
@@ -216,50 +219,50 @@ end
 
 # We assign one queue to each sidekiq process
 def run(number_of_processes, total_queues)
-    read_stream, write_stream = IO.pipe
+  read_stream, write_stream = IO.pipe
 
-    queues = []
-    (0..total_queues-1).each do |idx|
-      queues.push("queue:q#{idx}")
-    end
+  queues = []
+  (0..total_queues-1).each do |idx|
+    queues.push("queue:q#{idx}")
+  end
 
-    Sidekiq.logger.info("Queues are: #{queues}")
+  Sidekiq.logger.info("Queues are: #{queues}")
 
-    # Produce
-    start = Time.now
-    (0..total_queues-1).each do |idx|
-      Process.fork do
-          queue_num = "q#{idx}"
-          setup(queue_num)
-      end
+  # Produce
+  start = Time.now
+  (0..total_queues-1).each do |idx|
+    Process.fork do
+      queue_num = "q#{idx}"
+      setup(queue_num)
     end
+  end
 
-    queue_sz = $iterations * $elements * total_queues
-    Process.waitall
-
-    ending = Time.now - start
-    #Sidekiq.logger.info("Pushed #{queue_sz} in #{ending} secs")
-
-    # Consume
-    (0..number_of_processes-1).each do |idx|
-      Process.fork do
-          # First process only consumes from it's own queue but monitors all queues.
-          # It works as a synchronization point. Once all processes finish
-          # (that is, when all queues are emptied) it prints the the stats.
-          if idx == 0
-            queue = "q#{idx}"
-            consume(queues, queue, true)
-          else
-            queue = "q#{idx % total_queues}"
-            consume(queues, queue, false)
-          end
+  queue_sz = $iterations * $elements * total_queues
+  Process.waitall
+
+  ending = Time.now - start
+  #Sidekiq.logger.info("Pushed #{queue_sz} in #{ending} secs")
+
+  # Consume
+  (0..number_of_processes-1).each do |idx|
+    Process.fork do
+      # First process only consumes from it's own queue but monitors all queues.
+      # It works as a synchronization point. Once all processes finish
+      # (that is, when all queues are emptied) it prints the the stats.
+      if idx == 0
+        queue = "q#{idx}"
+        consume(queues, queue, true)
+      else
+        queue = "q#{idx % total_queues}"
+        consume(queues, queue, false)
       end
     end
+  end
 
-    Process.waitall
-    write_stream.close
-    results = read_stream.read
-    read_stream.close
+  Process.waitall
+  write_stream.close
+  results = read_stream.read
+  read_stream.close
 end
 
 $total_processes = ENV["PROCESSES"] ? Integer(ENV["PROCESSES"]) : 8;

data/lib/sidekiq/api.rb

@@ -773,7 +773,7 @@ module Sidekiq
   #
   class ScheduledSet < JobSet
     def initialize
-      super "schedule"
+      super("schedule")
     end
   end
 
@@ -787,7 +787,7 @@ module Sidekiq
   #
   class RetrySet < JobSet
     def initialize
-      super "retry"
+      super("retry")
     end
 
     # Enqueues all jobs pending within the retry set.
@@ -808,7 +808,7 @@ module Sidekiq
   #
   class DeadSet < JobSet
     def initialize
-      super "dead"
+      super("dead")
     end
 
     # Add the given job to the Dead set.

data/lib/sidekiq/cli.rb

@@ -38,7 +38,7 @@ module Sidekiq # :nodoc:
     # Code within this method is not tested because it alters
     # global process state irreversibly.  PRs which improve the
     # test coverage of Sidekiq::CLI are welcomed.
-    def run(boot_app: true)
+    def run(boot_app: true, warmup: true)
       boot_application if boot_app
 
       if environment == "development" && $stdout.tty? && @config.logger.formatter.is_a?(Sidekiq::Logger::Formatters::Pretty)
@@ -101,6 +101,8 @@ module Sidekiq # :nodoc:
       # Touch middleware so it isn't lazy loaded by multiple threads, #3043
       @config.server_middleware
 
+      ::Process.warmup if warmup && ::Process.respond_to?(:warmup)
+
       # Before this point, the process is initializing with just the main thread.
       # Starting here the process will now have multiple threads running.
       fire_event(:startup, reverse: false, reraise: true)

data/lib/sidekiq/job.rb

@@ -109,7 +109,7 @@ module Sidekiq
               m = "#{name}="
               undef_method(m) if method_defined?(m) || private_method_defined?(m)
             end
-            define_singleton_method("#{name}=") do |val|
+            define_singleton_method(:"#{name}=") do |val|
               singleton_class.class_eval do
                 ACCESSOR_MUTEX.synchronize do
                   undef_method(synchronized_getter) if method_defined?(synchronized_getter) || private_method_defined?(synchronized_getter)

data/lib/sidekiq/logger.rb

@@ -36,7 +36,7 @@ module Sidekiq
     end
 
     LEVELS.each do |level, numeric_level|
-      define_method("#{level}?") do
+      define_method(:"#{level}?") do
         local_level.nil? ? super() : local_level <= numeric_level
       end
     end

data/lib/sidekiq/middleware/current_attributes.rb

@@ -54,7 +54,7 @@ module Sidekiq
             cattrs_to_reset << constklass
 
             job[key].each do |(attribute, value)|
-              constklass.public_send("#{attribute}=", value)
+              constklass.public_send(:"#{attribute}=", value)
             end
           end
         end

data/lib/sidekiq/rails.rb

@@ -20,6 +20,10 @@ module Sidekiq
       def inspect
         "#<Sidekiq::Rails::Reloader @app=#{@app.class.name}>"
       end
+
+      def to_hash
+        { app: @app.class.name }
+      end
     end
 
     # By including the Options module, we allow AJs to directly control sidekiq features

data/lib/sidekiq/redis_connection.rb

@@ -66,9 +66,7 @@ module Sidekiq
           EOM
         end
 
-        ENV[
-          p || "REDIS_URL"
-        ]
+        ENV[p.to_s] || ENV["REDIS_URL"]
       end
     end
   end

data/lib/sidekiq/transaction_aware_client.rb

@@ -9,7 +9,14 @@ module Sidekiq
       @redis_client = Client.new(pool: pool, config: config)
     end
 
+    def batching?
+      Thread.current[:sidekiq_batch]
+    end
+
     def push(item)
+      # 6160 we can't support both Sidekiq::Batch and transactions.
+      return @redis_client.push(item) if batching?
+
       # pre-allocate the JID so we can return it immediately and
       # save it to the database as part of the transaction.
       item["jid"] ||= SecureRandom.hex(12)

data/lib/sidekiq/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "7.2.1"
+  VERSION = "7.2.2"
   MAJOR = 7
 end

data/lib/sidekiq/web/csrf_protection.rb

@@ -56,7 +56,7 @@ module Sidekiq
       end
 
       def logger(env)
-        @logger ||= (env["rack.logger"] || ::Logger.new(env["rack.errors"]))
+        @logger ||= env["rack.logger"] || ::Logger.new(env["rack.errors"])
       end
 
       def deny(env)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 7.2.1
+  version: 7.2.2
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-client