From de197000e7c7179873f8cc469babcdda14e5882c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 22 Jan 2019 14:14:13 +0800
Subject: [PATCH] FIX: Clear connections before disabling readonly mode.

---
 .../connection_adapters/postgresql_fallback_adapter.rb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
index 7b837119ea2..196eb710ca7 100644
--- a/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
+++ b/lib/active_record/connection_adapters/postgresql_fallback_adapter.rb
@@ -84,9 +84,9 @@ class PostgreSQLFallbackHandler
             if is_connection_active
               logger.warn "#{log_prefix}: Master server is active. Reconnecting..."
               self.master_up(key)
+              clear_connections
               disable_readonly_mode
               Sidekiq.unpause!
-              clear_connections
             end
           rescue => e
             logger.warn "#{log_prefix}: Connection to master PostgreSQL server failed with '#{e.message}'"