AdoccaMemcache 0.1.4 → 0.1.5

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 require './lib/adocca_memcache.rb'
 
-Hoe.new('AdoccaMemcache', '0.1.4') do |p|
+Hoe.new('AdoccaMemcache', '0.1.5') do |p|
   p.rubyforge_name = 'adocca-plugins'
   p.author = 'adocca Entertainment AB'
   p.summary = 'A client library to simplify using memcached with Ruby on Rails projects.'

data/lib/am_memcache.rb

@@ -43,6 +43,9 @@ module Adocca
     # Default memcached server weight.
     DEFAULT_WEIGHT = 1
 
+    # Default interval between checking server liveliness
+    VALIDATION_INTERVAL = 30
+
     # The amount of time to wait for a response from a memcached server.  If a
     # response is not completed within this time, the connection to the server
     # will be closed and an error will be raised.
@@ -69,6 +72,28 @@ module Adocca
       end
       @servers   = []
       @buckets   = []
+      start_validation
+    end
+
+    def start_validation
+      Thread.new do
+        loop do
+          begin
+            @servers.each do |server|
+              server.check_liveliness if server.alive?
+            end
+            sleep VALIDATION_INTERVAL
+          rescue Exception => e
+            if defined?(RAILS_DEFAULT_LOGGER)
+              RAILS_DEFAULT_LOGGER.error("validation got #{e}")
+              RAILS_DEFAULT_LOGGER.error(PP.pp(e.backtrace, ""))
+            else
+              puts e
+              pp e.backtrace
+            end
+          end
+        end
+      end
     end
 
     # Return a string representation of the cache object.
@@ -129,7 +154,7 @@ module Adocca
           sock.gets
           sock.gets
         rescue SystemCallError, IOError => err
-          server.close
+          server.mark_dead
           raise MemCacheError, err.message
         end
       end
@@ -246,7 +271,7 @@ module Adocca
           sock.gets
           sock.gets
         rescue SystemCallError, IOError => err
-          server.close
+          server.mark_dead
           raise MemCacheError, err.message
         end
         
@@ -269,7 +294,7 @@ module Adocca
             sock.write "flush_all\r\n"
             sock.gets
           rescue SystemCallError, IOError => err
-            server.close
+            server.mark_dead
             raise MemCacheError, err.message
           end
         end
@@ -346,11 +371,15 @@ module Adocca
       # The amount of time to wait to establish a connection with a
       # memcached server.  If a connection cannot be established within
       # this time limit, the server will be marked as down.
-      CONNECT_TIMEOUT = 0.25
+      CONNECT_TIMEOUT = 1
 
       # The amount of time to wait before attempting to re-establish a
       # connection with a server that is marked dead.
-      RETRY_DELAY = 30.0
+      RETRY_DELAY = 10
+
+      # Default timeout for getting all the necessary info from the server when
+      # checking liveliness
+      LIVELINESS_TIMEOUT = 5
 
       # The host the memcached server is running on.
       attr_reader :host
@@ -378,6 +407,7 @@ module Adocca
 
         @host   = host
         @port   = port.to_i
+        @id = Integer("0x#{Digest::SHA1.hexdigest("#{host}:#{port}")}")
         @weight = weight.to_i
 
         @sock   = nil
@@ -385,6 +415,34 @@ module Adocca
         @status = "NOT CONNECTED"
       end
 
+      #
+      # Will make sure the server works and mark_dead if not.
+      #
+      def check_liveliness
+        key = rand(1 << 32).to_s
+        value = rand(1 << 32).to_s
+        begin
+          timeout(LIVELINESS_TIMEOUT) do
+            socket.write("set am_memcache_check_liveliness_#{key} 0 #{LIVELINESS_TIMEOUT * 2} #{value.size}\r\n" + value + "\r\n")
+            raise 'bad response to set' unless @sock.gets == "STORED\r\n"
+            socket.write("get am_memcache_check_liveliness_#{key}\r\n")
+            v, cache_key, flags, bytes = @sock.gets.split(/ /)
+            raise 'bad response to get' unless @sock.read(bytes.to_i) == value
+            socket.gets
+            socket.gets
+          end
+        rescue Exception => e
+          mark_dead
+          if defined?(RAILS_DEFAULT_LOGGER)
+            RAILS_DEFAULT_LOGGER.error("liveliness check got #{e}")
+            RAILS_DEFAULT_LOGGER.error(PP.pp(e.backtrace, ""))
+          else
+            puts e
+            pp e.backtrace
+          end
+        end
+      end
+
       # Return a string representation of the server object.
       def inspect
         sprintf("<MemCache::Server: %s:%d [%d] (%s)>",
@@ -500,7 +558,7 @@ module Adocca
         sock.write "#{command}\r\n"
         [sock.gets, sock, server]
       rescue SystemCallError, IOError => err
-        server.close
+        server.mark_dead
         raise MemCacheError, err.message
       end
     end
@@ -554,9 +612,6 @@ module Adocca
 
     # Pick a server to handle the request based on a hash of the key.
     def get_server_for_key(key)
-      # Easy enough if there is only one server.
-      return @servers.first if @servers.length == 1
-
       # Hash the value of the key to select the bucket.
       hkey = Integer("0x#{key}")
       

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: AdoccaMemcache
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
-date: 2007-01-17 00:00:00 +01:00
+  version: 0.1.5
+date: 2007-02-12 00:00:00 +01:00
 summary: A client library to simplify using memcached with Ruby on Rails projects.
 require_paths: 
 - lib