From 2adae2a0b69bf7c5479204da374366ddd4b99a54 Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 12 Jun 2018 00:08:47 +0800
Subject: [PATCH] FIX: Be more aggressive in checking master when trying to
 fallback.

---
 .../connection_adapters/postgresql_fallback_adapter.rb          | 2 +-
 lib/discourse_redis.rb                                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index 509468d5475..3491f1ce896 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -33,7 +33,7 @@ class PostgreSQLFallbackHandler
         thread = Thread.new { initiate_fallback_to_master }
         thread.join
         break if synchronize { @masters_down.hash.empty? }
-        sleep 10
+        sleep 5
       end
     end
 
diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb
index 800acd4980d..00647242b84 100644
--- a/lib/discourse_redis.rb
+++ b/lib/discourse_redis.rb
@@ -27,7 +27,7 @@ class DiscourseRedis
             thread = Thread.new { initiate_fallback_to_master }
             thread.join
             break if synchronize { @master }
-            sleep 10
+            sleep 5
           ensure
             thread.kill
           end