sidekiq 4.0.0.pre1 → 4.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd499d714dee9ad44fb3ebeb652cb3f42d15cf28
-  data.tar.gz: 58f3537c50b420df72a7fc3db4cd9b909b26a041
+  metadata.gz: 9ae613def4b402732162cb005ca3179a1a810e09
+  data.tar.gz: 36aab3dd08ed5370fce1f2a6de7fae6973222dfb
 SHA512:
-  metadata.gz: 431951c7f5d24d3a2fc274c7de7a8576667f542b236ddb704bd99ab5ab94d53ae57153066b3d3e1f674093933a2484ada3044d01a26d8f66f2e08be2447098a5
-  data.tar.gz: 0bbe8c6eeb19eb3f0a9e5cd7ac86f477cc73031c32c03b3e001d272bd04595960e317fe7032f8ee41da83861b236b1f7ffc1b864cfe8c48df67bbe0a1904365b
+  metadata.gz: a2b0c7ab9631689ea1afd0bdbb0d5eb0122ac4258b245c91c7ffed51b3d65dfb3c1c5b5492c235f8ab0ef628b5a154e2a9cab4a9cb75dc2e1f2029670f63d223
+  data.tar.gz: 1d1391df672310f61563ba6a5125602104690a587da72a58038f33492626ab80cad60a7bba61507cadbf26d0bcc9d864d863adb43592e6543965072c5240af86

data/Changes.md

@@ -8,6 +8,11 @@
   [detailed on my blog](http://www.mikeperham.com/2015/10/14/optimizing-sidekiq/).
 - See the [4.0 upgrade notes](4.0-Upgrade.md) for more detail.
 
+3.5.3
+-----------
+
+- Adjust shutdown event to run in parallel with the rest of system shutdown. [#2635]
+
 3.5.2
 -----------
 

data/Ent-Changes.md

@@ -3,7 +3,14 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
-HEAD
+0.7.7
+----------
+
+- Fix racy shutdown event which could lead to disappearing periodic
+  jobs, requires Sidekiq >= 3.5.3.
+- Add new :leader event which is fired when a process gains leadership.
+
+0.7.6
 ----------
 
 - Redesign how overrated jobs are rescheduled to avoid creating new

data/Pro-Changes.md

@@ -3,6 +3,16 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+3.0.0
+-----------
+
+- See the [Pro 3.0 release notes](Pro-3.0-Upgrade.md).
+
+2.1.2
+-----------
+
+- Lock Sidekiq Pro 2.x to Sidekiq 3.x.
+
 2.1.1
 -----------
 

data/README.md

@@ -32,7 +32,7 @@ are untested but might work fine.  MRI 1.9 is no longer supported.
 
 All Rails releases starting from 3.2 are officially supported.
 
-Redis 2.4 or greater is required.
+Redis 2.8 or greater is required.
 
 
 Installation
@@ -66,7 +66,7 @@ Please see the [sidekiq wiki](https://github.com/mperham/sidekiq/wiki) for the o
 [mperham/sidekiq on Gitter](https://gitter.im/mperham/sidekiq) is dedicated to this project,
 but bug reports or feature requests suggestions should still go through [issues on Github](https://github.com/mperham/sidekiq/issues).  Release announcements are made to the [@sidekiq](https://twitter.com/sidekiq) Twitter account.
 
-You may also find useful a [Google Group](https://groups.google.com/forum/#!forum/sidekiq) dedicated to Sidekiq discussion and [a Sidekiq tag](https://stackoverflow.com/questions/tagged/sidekiq) on Stack Overflow.
+You may also find useful a [Reddit area](https://reddit.com/r/sidekiq) dedicated to Sidekiq discussion and [a Sidekiq tag](https://stackoverflow.com/questions/tagged/sidekiq) on Stack Overflow.
 
 
 Problems?
@@ -75,14 +75,14 @@ Problems?
 **Please do not directly email any Sidekiq committers with questions or problems.**  A community is best served when discussions are held in public.
 
 If you have a problem, please review the [FAQ](https://github.com/mperham/sidekiq/wiki/FAQ) and [Troubleshooting](https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting) wiki pages. Searching the issues for your problem is also a good idea.  If that doesn't help, feel free to email the Sidekiq mailing list, chat in Gitter, or open a new issue.
-The mailing list is the preferred place to ask questions on usage. If you are encountering what you think is a bug, please open an issue.
+StackOverflow or Reddit is the preferred place to ask questions on usage. If you are encountering what you think is a bug, please open an issue.
 
 
 Thanks
 -----------------
 
 Sidekiq stays fast by using the [JProfiler java profiler](http://www.ej-technologies.com/products/jprofiler/overview.html) to find and fix
-performance problems on JRuby.  Unfortunately MRI does not have good profile tooling.
+performance problems on JRuby.  Unfortunately MRI does not have good multithreaded profiling tools.
 
 
 License

data/bin/sidekiqctl

@@ -60,11 +60,11 @@ class Sidekiqctl
   end
 
   def quiet
-    Process.kill(:USR1, pid)
+    `kill -USR1 #{pid}`
   end
 
   def stop
-    Process.kill(:TERM, pid)
+    `kill -TERM #{pid}`
     kill_timeout.times do
       begin
         Process.getpgid(pid)
@@ -74,7 +74,7 @@ class Sidekiqctl
       end
       sleep 1
     end
-    Process.kill(:KILL, pid)
+    `kill -9 #{pid}`
     FileUtils.rm_f pidfile
     done 'Sidekiq shut down forcefully.'
   end

data/lib/sidekiq/api.rb

@@ -225,7 +225,7 @@ module Sidekiq
       page = 0
       page_size = 50
 
-      loop do
+      while true do
         range_start = page * page_size - deleted_size
         range_end   = page * page_size - deleted_size + (page_size - 1)
         entries = Sidekiq.redis do |conn|
@@ -488,7 +488,7 @@ module Sidekiq
       page = -1
       page_size = 50
 
-      loop do
+      while true do
         range_start = page * page_size + offset_size
         range_end   = page * page_size + offset_size + (page_size - 1)
         elements = Sidekiq.redis do |conn|

data/lib/sidekiq/cli.rb

@@ -97,9 +97,9 @@ module Sidekiq
       rescue Interrupt
         logger.info 'Shutting down'
         launcher.stop
-        fire_event(:shutdown, true)
         # Explicitly exit so busy Processor threads can't block
         # process shutdown.
+        logger.info "Bye!"
         exit(0)
       end
     end
@@ -134,7 +134,6 @@ module Sidekiq
       when 'USR1'
         Sidekiq.logger.info "Received USR1, no longer accepting new work"
         launcher.quiet
-        fire_event(:quiet, true)
       when 'USR2'
         if Sidekiq.options[:logfile]
           Sidekiq.logger.info "Received USR2, reopening log file"

data/lib/sidekiq/manager.rb

@@ -52,10 +52,17 @@ module Sidekiq
 
       logger.info { "Terminating quiet workers" }
       @workers.each { |x| x.terminate }
+      fire_event(:quiet, true)
     end
 
     def stop(deadline)
       quiet
+      fire_event(:shutdown, true)
+
+      # some of the shutdown events can be async,
+      # we don't have any way to know when they're done but
+      # give them a little time to take effect
+      sleep 0.5
       return if @workers.empty?
 
       logger.info { "Pausing to allow workers to finish..." }

data/lib/sidekiq/redis_connection.rb

@@ -9,7 +9,7 @@ module Sidekiq
       def create(options={})
         options[:url] ||= determine_redis_provider
 
-        size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 2) : 5)
+        size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 5) : 5)
 
         verify_sizing(size, Sidekiq.options[:concurrency]) if Sidekiq.server?
 

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "4.0.0.pre1"
+  VERSION = "4.0.0.pre2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre1
+  version: 4.0.0.pre2
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis