fix(connection) synchronize agents pool

abak-press · Oct 2, 2013 · bd21a92 · bd21a92
1 parent a9f5953
commit bd21a92
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/lib/sphinx/integration/mysql/connection_pool.rb b/lib/sphinx/integration/mysql/connection_pool.rb
@@ -48,11 +48,16 @@ def self.master_pool
   end
 
   def self.agents_pool(agent_name)
-    @agents_pool ||= {}
-    @agents_pool[agent_name] ||= Innertube::Pool.new(
-      Proc.new { Sphinx::Integration::Mysql::ConnectionPool.slave_connection(agent_name) },
-      Proc.new { |connection| connection.close }
-    )
+    return @agents_pool[agent_name] if @agents_pool.key?(agent_name)
+
+    @take_slaves_mutex.synchronize do
+      return @agents_pool[agent_name] if @agents_pool.key?(agent_name)
+
+      @agents_pool[agent_name] ||= Innertube::Pool.new(
+        Proc.new { Sphinx::Integration::Mysql::ConnectionPool.slave_connection(agent_name) },
+        Proc.new { |connection| connection.close }
+      )
+    end
   end
 
   def self.take
@@ -79,6 +84,9 @@ def self.take
   end
 
   def self.take_slaves(silent = true)
+    @take_slaves_mutex ||= Mutex.new
+    @agents_pool ||= {}
+
     threads = []
 
     ThinkingSphinx::Configuration.instance.agents.each do |agent_name, _|