Catch all Redis errors and check for NOREPLICAS, fixes #4495

sidekiq · Jun 19, 2020 · 267b4cc · 267b4cc
1 parent 66bb436
commit 267b4cc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb
@@ -96,10 +96,11 @@ def self.redis
       retryable = true
       begin
         yield conn
-      rescue Redis::CommandError => ex
+      rescue Redis::BaseError => ex
         # 2550 Failover can cause the server to become a replica, need
         # to disconnect and reopen the socket to get back to the primary.
-        if retryable && ex.message =~ /READONLY/
+        # 4495 Use the same logic if we have a "Not enough replicas" error from the primary
+        if retryable && ex.message =~ /READONLY|NOREPLICAS/
           conn.disconnect!
           retryable = false
           retry