Terminate fetcher async'ly so it doesn't block shutdown progress

kulesa · Apr 25, 2012 · 06b6aa4 · 06b6aa4
1 parent c282674
commit 06b6aa4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/sidekiq/manager.rb b/lib/sidekiq/manager.rb
@@ -39,7 +39,7 @@ def stop(options={})
         timeout = options[:timeout]
 
         @done = true
-        @fetcher.terminate if @fetcher.alive?
+        @fetcher.terminate! if @fetcher.alive?
 
         logger.info { "Shutting down #{@ready.size} quiet workers" }
         @ready.each { |x| x.terminate if x.alive? }

diff --git a/test/test_manager.rb b/test/test_manager.rb
@@ -38,6 +38,13 @@ def perform(a, b)
       result = q.timed_pop(1.0)
       assert_equal 'done', result
       mgr.stop
+      mgr.terminate
+
+      # Gross bloody hack because I can't get the actor threads
+      # to shut down cleanly in the test.  Need @bascule's help here.
+      (Thread.list - [Thread.current]).each do |t|
+        t.raise Interrupt
+      end
     end
   end
 end