From 615a22a579221dfe5509c8dd7bcf01a93abba9d5 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 20 Feb 2019 09:46:08 +0800
Subject: [PATCH] FIX: Race condition in SidekiqPauser.

This was showing up in our tests.
---
 lib/sidekiq/pausable.rb | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/lib/sidekiq/pausable.rb b/lib/sidekiq/pausable.rb
index 57fa22123f5..000a0e35842 100644
--- a/lib/sidekiq/pausable.rb
+++ b/lib/sidekiq/pausable.rb
@@ -11,11 +11,7 @@ class SidekiqPauser
 
   def pause!(value = "paused")
     $redis.setex PAUSED_KEY, TTL, value
-
-    @mutex.synchronize do
-      extend_lease_thread
-    end
-
+    extend_lease_thread
     true
   end
 
@@ -75,24 +71,27 @@ class SidekiqPauser
   end
 
   def extend_lease_thread
-    # should always be called from a mutex
-    @dbs << RailsMultisite::ConnectionManagement.current_db
+    @mutex.synchronize do
+      @dbs << RailsMultisite::ConnectionManagement.current_db
 
-    @extend_lease_thread ||= Thread.new do
-      while true do
-        break if !@extend_lease_thread
+      @extend_lease_thread ||= Thread.new do
+        while true do
+          @mutex.synchronize do
+            break if !@extend_lease_thread
 
-        @dbs.each do |db|
-          RailsMultisite::ConnectionManagement.with_connection(db) do
-            if !$redis.expire(PAUSED_KEY, TTL)
-              # if it was unpaused in another process we got to remove the
-              # bad key
-              @dbs.delete(db)
+            @dbs.each do |db|
+              RailsMultisite::ConnectionManagement.with_connection(db) do
+                if !$redis.expire(PAUSED_KEY, TTL)
+                  # if it was unpaused in another process we got to remove the
+                  # bad key
+                  @dbs.delete(db)
+                end
+              end
             end
           end
-        end
 
-        sleep(Rails.env.test? ? 0.01 : TTL / 2)
+          sleep(Rails.env.test? ? 0.01 : TTL / 2)
+        end
       end
     end
   end