redis_ring_client 0.0.4 → 0.1.0

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    redis_ring_client (0.0.3)
+    redis_ring_client (0.0.4)
       json
       redis
+      zookeeper
 
 GEM
   remote: http://rubygems.org/
@@ -21,6 +22,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
     ruby-prof (0.9.2)
+    zookeeper (0.4.3)
 
 PLATFORMS
   ruby

data/lib/redis_ring/client/ring_meta_data.rb

@@ -5,22 +5,18 @@ module RedisRing
 
     class RingMetaData
 
-      attr_reader :host, :port
+      attr_reader :zookeeper_addr, :zookeeper
 
-      def initialize(host, port)
-        @host = host
-        @port = port
-        @loaded = false
+      def initialize(zookeeper_addr)
+        @zookeeper_addr = zookeeper_addr
       end
 
       def reload!
         json = get_shards_json_string
         hash = JSON.parse(json)
 
-        @ring_size = hash['count']
+        @ring_size = hash['ring_size']
         @shards = (0...@ring_size).map{|n| ShardMetaData.from_json(hash['shards'][n.to_s])}
-
-        @loaded = true
       end
 
       def ring_size
@@ -42,11 +38,19 @@ module RedisRing
       protected
 
       def should_reload?
-        !@loaded
+        !@zookeeper || @watcher.completed?
       end
 
-      def get_shards_json_string
-        Net::HTTP.get(host, '/shards', port)
+      def get_shards_json_string(retries = 0)
+        @zookeeper ||= Zookeeper.new(zookeeper_addr)
+        @watcher = Zookeeper::WatcherCallback.new
+        resp = @zookeeper.get(:path => "/cluster_status", :watcher => @watcher, :watcher_context => "/cluster_status")
+        return resp[:data]
+      rescue ZookeeperExceptions::ZookeeperException::ConnectionClosed
+        raise if retries == 4
+        puts "reopening"
+        @zookeeper.reopen
+        return get_shards_json_string(retries + 1)
       end
 
     end
@@ -59,12 +63,17 @@ module RedisRing
         @host = host
         @port = port
         @status = status
+        @sym = :"Redis<#{host}:#{port}>"
       end
 
       def self.from_json(hash)
         new(hash['host'], hash['port'].to_i, hash['status'].to_sym)
       end
 
+      def to_sym
+        @sym
+      end
+
     end
 
   end

data/lib/redis_ring/client/ring_proxy.rb

@@ -151,8 +151,7 @@ module RedisRing
       end
 
       def initialize(opts = {})
-        @host = opts[:host] || 'localhost'
-        @port = opts[:port] || 6400
+        @zookeeper = opts[:zookeeper] || 'localhost:2181'
         @db = opts[:db] || 0
         @password = opts[:password]
       end
@@ -175,7 +174,7 @@ module RedisRing
       protected
 
       def ring_meta_data
-        @ring_meta_data ||= RingMetaData.new(@host, @port)
+        @ring_meta_data ||= RingMetaData.new(@zookeeper)
       end
 
       def sharder

data/lib/redis_ring/client/shard_connection_pool.rb

@@ -13,16 +13,18 @@ module RedisRing
       end
 
       def connection(shard_number)
-        @connections[shard_number] ||= new_connection_to_shard(shard_number)
+        connection, conn_id = @connections[shard_number]
+        shard_metadata = metadata.shard(shard_number)
+        unless conn_id == shard_metadata.to_sym
+          connection = new_connection(shard_metadata.host, shard_metadata.port, db, password)
+          conn_id = shard_metadata.to_sym
+          @connections[shard_number] = [connection, conn_id]
+        end
+        connection
       end
 
       protected
 
-      def new_connection_to_shard(shard_number)
-        shard_metadata = metadata.shard(shard_number)
-        new_connection(shard_metadata.host, shard_metadata.port, db, password)
-      end
-
       def new_connection(host, port, db, password)
         Redis.new(:host => host, :port => port, :db => db, :password => password)
       end

data/lib/redis_ring/client/version.rb

@@ -1,5 +1,5 @@
 module RedisRing
   module Client
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/lib/redis_ring/client.rb

@@ -1,8 +1,8 @@
 require 'zlib'
-require 'net/http'
 
 require 'redis'
 require 'json'
+require 'zookeeper'
 
 require 'redis_ring/client/operation_definitions'
 require 'redis_ring/client/ring_proxy'

data/redis_ring_client.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'redis'
   s.add_dependency 'json'
+  s.add_dependency 'zookeeper'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'mocha'

data/spec/redis_ring/client/ring_meta_data_spec.rb

@@ -4,7 +4,7 @@ describe RedisRing::Client::RingMetaData do
 
   def sample_shards_hash
     {
-      :count => 10,
+      :ring_size => 10,
       :shards => {
         0 => {:host => '192.168.1.1', :port => 6401, :status => :running},
         1 => {:host => '192.168.1.1', :port => 6402, :status => :running},
@@ -24,19 +24,23 @@ describe RedisRing::Client::RingMetaData do
     sample_shards_hash.to_json
   end
 
+  def stub_zookeeper
+    Zookeeper.any_instance.expects(:get).returns(:data => sample_shard_json)
+  end
+
   it "should download json lazily" do
-    @metadata = RedisRing::Client::RingMetaData.new('host', 666)
+    @metadata = RedisRing::Client::RingMetaData.new('localhost:2181')
 
-    Net::HTTP.expects(:get).with('host', '/shards', 666).returns(sample_shard_json)
+    stub_zookeeper
 
     @metadata.ring_size.should == 10
   end
 
   context "with sample shards json" do
     before(:each) do
-      Net::HTTP.stubs(:get => sample_shard_json)
+      stub_zookeeper
 
-      @metadata = RedisRing::Client::RingMetaData.new('host', 666)
+      @metadata = RedisRing::Client::RingMetaData.new('localhost:2181')
     end
 
     it "should have ring_size of 10" do

data/spec/redis_ring/client/ring_proxy_spec.rb

@@ -36,8 +36,11 @@ describe RedisRing::Client::RingProxy do
   end
 
   context "with real RedisRing" do
-    before(:each) do
+    before(:all) do
       @proxy = RedisRing::Client::RingProxy.new
+    end
+
+    before(:each) do
       @proxy.flushdb
     end
 

data/spec/redis_ring/client/shard_connection_pool_spec.rb

@@ -24,4 +24,14 @@ describe RedisRing::Client::ShardConnectionPool do
     @connection_pool.connection(1).should == :foo
   end
 
+  it "should create a new connection if the metadata changes" do
+    @connection_pool.expects(:new_connection).with("host1", 667, @db, @password).returns(:foo).once
+    @connection_pool.connection(1).should == :foo
+
+    @metadata.shards[1] = RedisRing::Client::ShardMetaData.new("host1", 777, :running)
+
+    @connection_pool.expects(:new_connection).with("host1", 777, @db, @password).returns(:bar).once
+    @connection_pool.connection(1).should == :bar
+  end
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Adam Pohorecki
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 +01:00
+date: 2011-03-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: zookeeper
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -54,10 +54,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -70,7 +70,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ruby-prof
+  name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -82,6 +82,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ruby-prof
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: The client counterpart to the RedisRing gem.
 email: 
 - adam@pohorecki.pl