xbar 0.4.1 → 0.4.2

data/examples/{setup.rb → lib/setup.rb}

@@ -10,18 +10,23 @@ require 'xbar'
 module Examples
   module Setup
 
-    MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),  'migrations'))
+    MIGRATIONS_ROOT = File.expand_path(File.join(File.dirname(__FILE__),
+      '../migrations'))
+    
+    def self.clean
+      # This must agree with what's in the 'simple' JSON config file.  Make
+      # sure that we're starting with a clean slate.
+      %x{ rm -f /tmp/store.sqlite3 /tmp/bakery.sqlite3 \
+        /tmp/deli.sqlite3 /tmp/produce.sqlite3 }
+    end
 
     def self.start(xbar_env, app_env, version = nil)
 
-      # This must agree with what's in the 'simple' JSON config file.  Make
-      # sure that we're starting with a clean slate.
-      %x{ rm -f /tmp/paris.sqlite3 /tmp/france_1.sqlite3 \
-        /tmp/france_2.sqlite3 /tmp/france_3.sqlite3 }
+      clean
 
       # This directory should have a subdirectory called 'config' which
       # actually holds the config files.
-      XBar.directory = File.expand_path(File.dirname(__FILE__))
+      XBar.directory = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 
       # Initialize the mapper with the 'test' environment from the 'simple' 
       # configuration file.
@@ -37,6 +42,9 @@ module Examples
       if version
         ActiveRecord::Migrator.run(:down, MIGRATIONS_ROOT, version)
       end
+
+      clean
+
     end
 
   end

data/examples/migrations/1_create_users.rb

@@ -1,5 +1,5 @@
 class CreateUsers < ActiveRecord::Migration
-  using :france_nord, :france_central, :france_sud
+  using :produce, :bakery, :deli
   def change
     create_table :users do |t|
       t.string :name

data/examples/multithread.rb

@@ -0,0 +1,47 @@
+require 'active_support'
+require 'active_record'
+require 'xbar'
+
+XBar.directory = File.expand_path(File.dirname(__FILE__))
+XBar::Mapper.reset(xbar_env: 'canada', app_env: 'test')
+
+threads = []
+
+class User < ActiveRecord::Base; end
+
+config = XBar::Mapper.shards[:canada][0].spec.config
+
+if config[:adapter] == "mysql2"
+  client = Mysql2::Client.new(config)
+  client.query("DELETE FROM users")
+end
+
+5.times do |i|
+  threads << Thread.new(i) do
+    XBar.using(:canada) do
+      100.times do |j|
+        name = "Thread_#{i}_#{j}"
+        User.create(:name => name)
+        User.using_any.all # allow read from slave
+      end
+    end
+  end
+end
+
+threads.each(&:join)
+
+XBar::Mapper.disconnect_all!
+
+if config[:adapter] == "mysql2"
+  results = client.query("SELECT COUNT(*) AS count FROM users")
+  results.each do |row|
+    puts row["count"]
+  end
+
+end
+
+puts User.using(:canada).all.size
+puts User.using(:canada).all.size
+puts User.using(:canada_east).all.size
+puts User.using(:canada_central).all.size
+puts User.using(:canada_west).all.size

data/examples/pause.rb

@@ -0,0 +1,67 @@
+require_relative "lib/helpers"
+
+include XBar::Example::Helpers
+
+# More setup, before we start up threads.
+XBar.directory = File.expand_path(File.dirname(__FILE__))
+XBar::Mapper.reset(xbar_env: 'canada', app_env: 'test')
+class User < ActiveRecord::Base; end
+# %x{ ssh _mysql@deimos repctl switch_master 1 2 3 }
+
+empty_users_table(:canada)
+
+puts %x{ ssh _mysql@deimos repctl status}
+
+do_work(5, 100, :canada)
+
+sleep 1
+puts "Requesting all proxies to pause"
+request_pause
+print "Requests complete, waiting for pause..."
+wait_for_pause
+puts("done")
+
+count = query_users_table(:canada)
+puts "Before pause 1: entered #{count} records in master replica of Canada shard"
+sleep 1
+count = query_users_table(:canada)
+puts "Before pause 2: entered #{count} records in master replica of Canada shard"
+
+unpause
+
+join_workers
+
+cleanup_exited_threads
+
+count = query_users_table(:canada)
+puts "After join: #{count} records in master replica of Canada shard"
+
+puts "Done"
+exit 0
+
+puts %x{ ssh _mysql@deimos repctl status}
+
+puts %x{ ssh _mysql@deimos repctl switch_master 2 1 3 }
+puts %x{ ssh _mysql@deimos repctl status }
+
+XBar::Mapper.reset(xbar_env: 'canada2', app_env: 'test')
+
+do_work(5, 10, :canada)
+
+join_workers
+User.using(:canada_central).all.size
+cleanup_exited_threads
+
+puts %x{ ssh _mysql@deimos repctl status}
+
+puts query_users_table(:canada)
+puts User.using(:canada).all.size
+puts User.using(:canada_east).all.size
+puts User.using(:canada_central).all.size
+puts User.using(:canada_west).all.size
+
+# Switch master back to server 1 for the benefit of 
+# other tests.
+puts %x{ ssh _mysql@deimos repctl switch_master 1 2 3 }
+puts %x{ ssh _mysql@deimos repctl status }
+

data/examples/pause_switch.rb

@@ -0,0 +1,61 @@
+require_relative "lib/helpers"
+
+include XBar::Example::Helpers
+
+# More setup, before we start up threads.
+XBar.directory = File.expand_path(File.dirname(__FILE__))
+
+puts "Using XBar config files from #{XBar.directory}/config"
+
+XBar::Mapper.reset(xbar_env: 'canada', app_env: 'test')
+class User < ActiveRecord::Base; end
+%x{ ssh _mysql@deimos repctl switch_master 1 2 3 }
+
+empty_users_table(:canada)
+
+puts %x{ ssh _mysql@deimos repctl status}
+
+do_work(5, 100, :canada)
+
+sleep 1
+puts "Requesting all proxies to pause"
+request_pause
+print "Requests complete, waiting for pause..."
+wait_for_pause
+puts("done")
+
+count = query_users_table(:canada)
+puts "After pause : entered #{count} records in master replica of Canada shard"
+
+print "Switching master..."
+puts %x{ ssh _mysql@deimos repctl switch_master 2 1 3 }
+print "done:"
+puts %x{ ssh _mysql@deimos repctl status }
+
+print "Switching to new XBar environment..."
+XBar::Mapper.reset(xbar_env: 'canada2', app_env: 'test')
+puts "done."
+
+print "Resuming paused threads..."
+unpause
+puts "done."
+
+print "Waiting for all workers to complete..."
+join_workers
+puts "done"
+
+cleanup_exited_threads
+
+count = query_users_table(:canada)
+puts %x{ ssh _mysql@deimos repctl status}
+
+puts query_users_table(:canada)
+puts User.using(:canada).all.size
+puts User.using(:canada_east).all.size
+puts User.using(:canada_central).all.size
+puts User.using(:canada_west).all.size
+
+# Switch master back to server 1 for the benefit of 
+# other tests.
+puts %x{ ssh _mysql@deimos repctl switch_master 1 2 3 }
+puts %x{ ssh _mysql@deimos repctl status }

data/examples/switch.rb

@@ -0,0 +1,42 @@
+require_relative "lib/helpers"
+
+include XBar::Example::Helpers
+
+# More setup, before we start up threads.
+XBar.directory = File.expand_path(File.dirname(__FILE__))
+XBar::Mapper.reset(xbar_env: 'canada', app_env: 'test')
+class User < ActiveRecord::Base; end
+%x{ ssh _mysql@deimos repctl switch_master 1 2 3 }
+empty_users_table(:canada)
+
+puts %x{ ssh _mysql@deimos repctl status}
+
+do_work(5, 10, :canada)
+join_workers
+cleanup_exited_threads
+
+puts %x{ ssh _mysql@deimos repctl status}
+
+puts %x{ ssh _mysql@deimos repctl switch_master 2 1 3 }
+puts %x{ ssh _mysql@deimos repctl status }
+
+XBar::Mapper.reset(xbar_env: 'canada2', app_env: 'test')
+
+do_work(5, 10, :canada)
+
+join_workers
+User.using(:canada_central).all.size
+cleanup_exited_threads
+
+puts %x{ ssh _mysql@deimos repctl status}
+
+puts query_users_table(:canada)
+puts User.using(:canada).all.size
+puts User.using(:canada_east).all.size
+puts User.using(:canada_central).all.size
+puts User.using(:canada_west).all.size
+
+# Switch master back to server 1 for the benefit of 
+# other tests.
+puts %x{ ssh _mysql@deimos repctl switch_master 1 2 3 }
+puts %x{ ssh _mysql@deimos repctl status }

data/gemfiles/rails32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Volumes/Opt/projects/xbar
+  remote: /opt/projects/xbar
   specs:
-    xbar (0.4.0)
+    xbar (0.4.2)
       activerecord
       mysql2
 
@@ -53,7 +53,7 @@ GEM
     mime-types (1.17.2)
     multi_json (1.0.4)
     mysql2 (0.3.11)
-    pg (0.12.2)
+    pg (0.13.1)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.1)

data/lib/xbar.rb

@@ -13,6 +13,7 @@ require 'active_support/hash_with_indifferent_access'
 module XBar
   
   class ConfigError < StandardError; end
+  class RuntimeError < StandardError; end
   
   class << self
     attr_accessor :debug

data/lib/xbar/mapper.rb

@@ -58,7 +58,7 @@ module XBar
       @@cached_config = nil
       @@shards = HashWithIndifferentAccess.new
       @@connections = HashWithIndifferentAccess.new
-      @@proxies = []
+      @@proxies = {}
       @@adapters = Set.new
       @@config = nil
       @@app_env = nil
@@ -76,10 +76,17 @@ module XBar
 
       def config_from_file
         file_name = config_file_name
-        puts "XBar::Mapper, reading configuration from file #{file_name}"
+       
         if File.exists? file_name
+          if XBar.debug
+            puts "XBar::Mapper, reading configuration from file #{file_name}"
+          end
           config = JSON.parse(ERB.new(File.read(file_name)).result)
         else
+          if XBar.debug
+            puts("XBar::Mapper: No config file #{file_name} -- " +
+                 "Deriving defaults.")
+          end
           config = {}
         end
         HashWithIndifferentAccess.new(config)
@@ -115,6 +122,7 @@ module XBar
       # a hash in the XBar module.
       #
       def reset(options = {})
+        force = options.delete(:force)
         new_xbar_env = options[:xbar_env] || xbar_env
         if (new_xbar_env != xbar_env) || (options[:clear_cache]) ||
           (!@@cached_config.nil? && @@cached_config.empty?)
@@ -123,7 +131,9 @@ module XBar
         self.xbar_env = new_xbar_env
         self.app_env = options[:app_env] if options[:app_env]
             
-        # puts "XBar::Mapper#reset, xbar_env=#{xbar_env}, app_env=#{app_env}"
+        if XBar.debug
+          puts "XBar::Mapper#reset, xbar_env=#{xbar_env}, app_env=#{app_env}"
+        end
         initialize_shards(config)
         initialize_options(config)
         
@@ -159,9 +169,14 @@ module XBar
           @@adapters << connection_pool.spec.config
         end
         
-        @@proxies.each do |proxy|
-          proxy.reset_proxy
+        @@proxies.values.each do |proxy|
+          if force
+            proxy.do_reset
+          else
+            proxy.request_reset
+          end
         end
+
         self
       end
       
@@ -174,12 +189,33 @@ module XBar
         @@options[:verify_connection] ||= false
       end
       
+      # Register a proxy on behalf of the current thread.  This is only
+      # called by Proxy#new.  It is up to the calling thread to assign
+      # Thread.current[:connection_proxy] = <new proxy> if it wishes.
       def register(proxy)
-        @@proxies << proxy
-        
-        # If we hang on to a reference to proxies here, the proxy will
-        # never be garbage collected, even when the thread that it was
-        # assigned to goes away.  Find a way to fix this. XXX  
+	reset if shards.empty?
+        if @@proxies[Thread.current.object_id]
+          raise RuntimeError, "Mapper: already registered this proxy"
+        end
+        @@proxies[Thread.current.object_id] = proxy
+      end
+
+      # Unregister the proxy for the current thread, or for the specified
+      # thread.  A thread can be specified by passing a Thread instance or
+      # its object_id.
+      def unregister(thread_spec = Thread.current)
+        thread_spec = thread_spec.object_id if thread_spec.instance_of?(Thread)
+        XBar::Mapper.proxies.delete(thread_spec)
+      end
+
+      def disconnect_all!
+        shards.each do |name, pool_list|
+          pool_list.each_with_index do |p, i|
+            if p.connected?
+              p.disconnect!
+            end
+          end
+        end
       end
       
       def app_env
@@ -207,9 +243,15 @@ module XBar
       
       def initialize_shards(aconfig)
        
+        # The way this works right now, if the same adapter spec is used 
+        # in multiple shards, we will get multiple connection pools
+        # initialized with the same spec.  It might be better to share
+        # connection pools among the shards.
+
         @@connections.clear
         @@adapters.clear
         @@shards.clear
+        pool_for_spec = {}
         
         if aconfig
           begin
@@ -227,18 +269,23 @@ module XBar
           end
           if connection_key.kind_of? String
             spec = aconfig["connections"][connection_key]
-            pool = install_connection(connection_key, spec)
+           # unless pool = pool_for_spec[spec]
+              pool = install_connection(connection_key, spec)
+           #   pool_for_spec[spec] = pool
+           # end
             @@shards[shard_key] = [pool]
           else # an array of connection keys
             @@shards[shard_key] = []
             connection_key.each do |conn_key|
               spec = aconfig["connections"][conn_key]
-              pool = install_connection(conn_key, spec)
+              # unless pool = pool_for_spec[spec]
+                pool = install_connection(conn_key, spec)
+              #  pool_for_spec[spec] = pool
+              # end
               @@shards[shard_key] << pool
             end
           end
         end
-        # @@shards[:master] = [@@connections[:master]]
       end
       
       # Should return a ConnectionPool.
@@ -285,7 +332,7 @@ module XBar
     end
     
     # Give module XBar::Mapper the above class methods.
-     self.extend(ClassMethods)
+    self.extend(ClassMethods)
     
     Mapper.exports.each do |meth|
       define_method(meth) {Mapper.send(meth)}