memcached 0.15.1 → 0.15.2

data/BENCHMARKS

@@ -7,90 +7,90 @@ You can easily run your own benchmarks, as long as you have memcached itself on
 
 == x86-64 OS X
 
-These benchmarks were run on 64-bit Intel OS X 10.5 (25,000 iterations):
+These benchmarks were run on an OS X 10.5 Core 2 Duo machine (25,000 iterations):
 
-                                         user     system      total        real
-set:plain:noblock:memcached:net      0.650000   0.250000   0.900000 (  2.165262)
-set:plain:noblock:memcached:uds      0.580000   0.140000   0.720000 (  1.023195)
-set:plain:memcached:net              1.540000   2.440000   3.980000 (  9.317136)
-set:plain:memcached:uds              1.230000   1.400000   2.630000 (  4.919294)
-set:plain:memcache-client           21.030000   8.650000  29.680000 ( 31.999873)
-set:ruby:noblock:memcached:net       1.160000   0.250000   1.410000 (  2.685066)
-set:ruby:noblock:memcached:uds       1.080000   0.160000   1.240000 (  1.496034)
-set:ruby:memcached:net               2.250000   2.660000   4.910000 ( 10.650423)
-set:ruby:memcached:uds               1.930000   1.590000   3.520000 (  6.051250)
-set:ruby:memcache-client            22.000000   8.780000  30.780000 ( 32.554235)
-get:plain:memcached:net              1.860000   2.720000   4.580000 (  9.813708)
-get:plain:memcached:uds              1.540000   1.540000   3.080000 (  5.065145)
-get:plain:memcache-client           25.040000   8.780000  33.820000 ( 35.932318)
-get:ruby:memcached:net               2.380000   2.780000   5.160000 ( 10.395301)
-get:ruby:memcached:uds               1.960000   1.590000   3.550000 (  5.531036)
-get:ruby:memcache-client            25.490000   8.790000  34.280000 ( 36.092947)
-multiget:ruby:memcached:net          1.300000   0.970000   2.270000 (  3.424010)
-multiget:ruby:memcached:uds          1.280000   0.720000   2.000000 (  2.375904)
-multiget:ruby:memcache-client       13.380000   3.170000  16.550000 ( 17.743902)
-missing:ruby:memcached:net           2.450000   2.600000   5.050000 (  9.982122)
-missing:ruby:memcached:uds           2.080000   1.600000   3.680000 (  5.168750)
-missing:ruby:memcached:inline        2.370000   2.480000   4.850000 ( 10.374502)
-missing:ruby:memcached_UDS:inline    2.020000   1.600000   3.620000 (  5.315222)
-missing:ruby:memcache-client        21.200000   8.220000  29.420000 ( 30.533481)
-mixed:ruby:noblock:memcached:net     4.590000   6.050000  10.640000 ( 20.344957)
-mixed:ruby:noblock:memcached:uds     3.650000   2.650000   6.300000 ( 10.304713)
-mixed:ruby:memcached:net             4.580000   4.920000   9.500000 ( 19.785283)
-mixed:ruby:memcached:uds             3.850000   2.920000   6.770000 ( 10.850842)
-mixed:ruby:memcache-client          47.790000  16.510000  64.300000 ( 67.698660)
-hash:hsieh                           0.050000   0.000000   0.050000 (  0.051601)
-hash:fnv1_32                         0.090000   0.000000   0.090000 (  0.091872)
-hash:fnv1a_32                        0.140000   0.000000   0.140000 (  0.137040)
-hash:fnv1_64                         0.240000   0.000000   0.240000 (  0.246802)
-hash:fnv1a_64                        0.130000   0.000000   0.130000 (  0.133671)
-hash:murmur                          0.090000   0.000000   0.090000 (  0.095826)
-hash:default                         0.120000   0.000000   0.120000 (  0.124794)
-hash:jenkins                         0.100000   0.010000   0.110000 (  0.111693)
-hash:md5                             0.230000   0.000000   0.230000 (  0.229894)
-hash:crc                             0.090000   0.000000   0.090000 (  0.093286)
+                                           user     system      total        real
+  set:plain:noblock:memcached:net      0.650000   0.250000   0.900000 (  2.165262)
+  set:plain:noblock:memcached:uds      0.580000   0.140000   0.720000 (  1.023195)
+  set:plain:memcached:net              1.540000   2.440000   3.980000 (  9.317136)
+  set:plain:memcached:uds              1.230000   1.400000   2.630000 (  4.919294)
+  set:plain:memcache-client           21.030000   8.650000  29.680000 ( 31.999873)
+  set:ruby:noblock:memcached:net       1.160000   0.250000   1.410000 (  2.685066)
+  set:ruby:noblock:memcached:uds       1.080000   0.160000   1.240000 (  1.496034)
+  set:ruby:memcached:net               2.250000   2.660000   4.910000 ( 10.650423)
+  set:ruby:memcached:uds               1.930000   1.590000   3.520000 (  6.051250)
+  set:ruby:memcache-client            22.000000   8.780000  30.780000 ( 32.554235)
+  get:plain:memcached:net              1.860000   2.720000   4.580000 (  9.813708)
+  get:plain:memcached:uds              1.540000   1.540000   3.080000 (  5.065145)
+  get:plain:memcache-client           25.040000   8.780000  33.820000 ( 35.932318)
+  get:ruby:memcached:net               2.380000   2.780000   5.160000 ( 10.395301)
+  get:ruby:memcached:uds               1.960000   1.590000   3.550000 (  5.531036)
+  get:ruby:memcache-client            25.490000   8.790000  34.280000 ( 36.092947)
+  multiget:ruby:memcached:net          1.300000   0.970000   2.270000 (  3.424010)
+  multiget:ruby:memcached:uds          1.280000   0.720000   2.000000 (  2.375904)
+  multiget:ruby:memcache-client       13.380000   3.170000  16.550000 ( 17.743902)
+  missing:ruby:memcached:net           2.450000   2.600000   5.050000 (  9.982122)
+  missing:ruby:memcached:uds           2.080000   1.600000   3.680000 (  5.168750)
+  missing:ruby:memcached:inline        2.370000   2.480000   4.850000 ( 10.374502)
+  missing:ruby:memcached:uds:inline    2.020000   1.600000   3.620000 (  5.315222)
+  missing:ruby:memcache-client        21.200000   8.220000  29.420000 ( 30.533481)
+  mixed:ruby:noblock:memcached:net     4.590000   6.050000  10.640000 ( 20.344957)
+  mixed:ruby:noblock:memcached:uds     3.650000   2.650000   6.300000 ( 10.304713)
+  mixed:ruby:memcached:net             4.580000   4.920000   9.500000 ( 19.785283)
+  mixed:ruby:memcached:uds             3.850000   2.920000   6.770000 ( 10.850842)
+  mixed:ruby:memcache-client          47.790000  16.510000  64.300000 ( 67.698660)
+  hash:hsieh                           0.050000   0.000000   0.050000 (  0.051601)
+  hash:fnv1_32                         0.090000   0.000000   0.090000 (  0.091872)
+  hash:fnv1a_32                        0.140000   0.000000   0.140000 (  0.137040)
+  hash:fnv1_64                         0.240000   0.000000   0.240000 (  0.246802)
+  hash:fnv1a_64                        0.130000   0.000000   0.130000 (  0.133671)
+  hash:murmur                          0.090000   0.000000   0.090000 (  0.095826)
+  hash:default                         0.120000   0.000000   0.120000 (  0.124794)
+  hash:jenkins                         0.100000   0.010000   0.110000 (  0.111693)
+  hash:md5                             0.230000   0.000000   0.230000 (  0.229894)
+  hash:crc                             0.090000   0.000000   0.090000 (  0.093286)
 
 == x86-64 Linux
   
-These benchmarks were run on Xeon RHEL4 (25,000 iterations):
+These benchmarks were run on a RHEL4 Xeon machine (25,000 iterations):
 
-                                         user     system      total        real
-set:plain:noblock:memcached:net      0.560000   0.370000   0.930000 (  1.492691)
-set:plain:noblock:memcached:uds      0.500000   0.120000   0.620000 (  0.837311)
-set:plain:memcached:net              1.070000   1.350000   2.420000 (  4.655494)
-set:plain:memcached:uds              1.030000   0.590000   1.620000 (  3.126471)
-set:plain:memcache-client           19.270000   1.500000  20.770000 ( 24.860087)
-set:ruby:noblock:memcached:net       1.090000   0.120000   1.210000 (  2.583293)
-set:ruby:noblock:memcached:uds       1.100000   0.120000   1.220000 (  1.501633)
-set:ruby:memcached:net               1.760000   1.410000   3.170000 (  5.481738)
-set:ruby:memcached:uds               1.750000   0.590000   2.340000 (  4.040445)
-set:ruby:memcache-client            19.490000   1.430000  20.920000 ( 24.545314)
-get:plain:memcached:net              1.160000   1.200000   2.360000 (  4.515177)
-get:plain:memcached:uds              1.110000   0.630000   1.740000 (  3.039308)
-get:plain:memcache-client           22.100000   1.440000  23.540000 ( 26.822877)
-get:ruby:memcached:net               1.770000   1.110000   2.880000 (  5.029304)
-get:ruby:memcached:uds               1.680000   0.600000   2.280000 (  3.241249)
-get:ruby:memcache-client            22.770000   1.430000  24.200000 ( 28.643709)
-multiget:ruby:memcached:net          1.030000   0.420000   1.450000 (  2.132928)
-multiget:ruby:memcached:uds          1.080000   0.250000   1.330000 (  1.914999)
-multiget:ruby:memcache-client       13.410000   0.520000  13.930000 ( 15.359580)
-missing:ruby:memcached:net           1.760000   1.290000   3.050000 (  5.029804)
-missing:ruby:memcached:uds           1.730000   0.620000   2.350000 (  3.772379)
-missing:ruby:memcached:inline        1.750000   1.220000   2.970000 (  5.029707)
-missing:ruby:memcached_UDS:inline    1.620000   0.670000   2.290000 (  3.612413)
-missing:ruby:memcache-client        19.310000   1.360000  20.670000 ( 24.277446)
-mixed:ruby:noblock:memcached:net     3.530000   2.310000   5.840000 ( 10.037807)
-mixed:ruby:noblock:memcached:uds     3.270000   1.000000   4.270000 (  6.980218)
-mixed:ruby:memcached:net             3.760000   2.510000   6.270000 ( 10.478885)
-mixed:ruby:memcached:uds             3.740000   1.190000   4.930000 (  7.898747)
-mixed:ruby:memcache-client          45.900000   2.870000  48.770000 ( 56.733674)
-hash:hsieh                           0.040000   0.000000   0.040000 (  0.041816)
-hash:md5                             0.120000   0.000000   0.120000 (  0.121045)
-hash:fnv1_32                         0.060000   0.000000   0.060000 (  0.062099)
-hash:fnv1a_32                        0.060000   0.000000   0.060000 (  0.063173)
-hash:fnv1a_64                        0.070000   0.000000   0.070000 (  0.071170)
-hash:default                         0.080000   0.000000   0.080000 (  0.081224)
-hash:jenkins                         0.050000   0.000000   0.050000 (  0.053789)
-hash:fnv1_64                         0.090000   0.000000   0.090000 (  0.089719)
-hash:crc                             0.080000   0.000000   0.080000 (  0.079723)
-hash:murmur                          0.050000   0.000000   0.050000 (  0.048248)
+                                           user     system      total        real
+  set:plain:noblock:memcached:net      0.560000   0.370000   0.930000 (  1.492691)
+  set:plain:noblock:memcached:uds      0.500000   0.120000   0.620000 (  0.837311)
+  set:plain:memcached:net              1.070000   1.350000   2.420000 (  4.655494)
+  set:plain:memcached:uds              1.030000   0.590000   1.620000 (  3.126471)
+  set:plain:memcache-client           19.270000   1.500000  20.770000 ( 24.860087)
+  set:ruby:noblock:memcached:net       1.090000   0.120000   1.210000 (  2.583293)
+  set:ruby:noblock:memcached:uds       1.100000   0.120000   1.220000 (  1.501633)
+  set:ruby:memcached:net               1.760000   1.410000   3.170000 (  5.481738)
+  set:ruby:memcached:uds               1.750000   0.590000   2.340000 (  4.040445)
+  set:ruby:memcache-client            19.490000   1.430000  20.920000 ( 24.545314)
+  get:plain:memcached:net              1.160000   1.200000   2.360000 (  4.515177)
+  get:plain:memcached:uds              1.110000   0.630000   1.740000 (  3.039308)
+  get:plain:memcache-client           22.100000   1.440000  23.540000 ( 26.822877)
+  get:ruby:memcached:net               1.770000   1.110000   2.880000 (  5.029304)
+  get:ruby:memcached:uds               1.680000   0.600000   2.280000 (  3.241249)
+  get:ruby:memcache-client            22.770000   1.430000  24.200000 ( 28.643709)
+  multiget:ruby:memcached:net          1.030000   0.420000   1.450000 (  2.132928)
+  multiget:ruby:memcached:uds          1.080000   0.250000   1.330000 (  1.914999)
+  multiget:ruby:memcache-client       13.410000   0.520000  13.930000 ( 15.359580)
+  missing:ruby:memcached:net           1.760000   1.290000   3.050000 (  5.029804)
+  missing:ruby:memcached:uds           1.730000   0.620000   2.350000 (  3.772379)
+  missing:ruby:memcached:inline        1.750000   1.220000   2.970000 (  5.029707)
+  missing:ruby:memcached:uds:inline    1.620000   0.670000   2.290000 (  3.612413)
+  missing:ruby:memcache-client        19.310000   1.360000  20.670000 ( 24.277446)
+  mixed:ruby:noblock:memcached:net     3.530000   2.310000   5.840000 ( 10.037807)
+  mixed:ruby:noblock:memcached:uds     3.270000   1.000000   4.270000 (  6.980218)
+  mixed:ruby:memcached:net             3.760000   2.510000   6.270000 ( 10.478885)
+  mixed:ruby:memcached:uds             3.740000   1.190000   4.930000 (  7.898747)
+  mixed:ruby:memcache-client          45.900000   2.870000  48.770000 ( 56.733674)
+  hash:hsieh                           0.040000   0.000000   0.040000 (  0.041816)
+  hash:md5                             0.120000   0.000000   0.120000 (  0.121045)
+  hash:fnv1_32                         0.060000   0.000000   0.060000 (  0.062099)
+  hash:fnv1a_32                        0.060000   0.000000   0.060000 (  0.063173)
+  hash:fnv1a_64                        0.070000   0.000000   0.070000 (  0.071170)
+  hash:default                         0.080000   0.000000   0.080000 (  0.081224)
+  hash:jenkins                         0.050000   0.000000   0.050000 (  0.053789)
+  hash:fnv1_64                         0.090000   0.000000   0.090000 (  0.089719)
+  hash:crc                             0.080000   0.000000   0.080000 (  0.079723)
+  hash:murmur                          0.050000   0.000000   0.050000 (  0.048248)

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.15.2. Don't require memcached itself to build. Fix for AUTO_EJECT_HOSTS in random and modulus pools. Support binary protocol.
+
 v0.15.1. Fix build problem.
 
 v0.15. Update to libmemcached 0.31.1. UDP support. Domain socket support (hellvinz). Bugfixes. Bundle libmemcached itself with the gem (antifuchs).

data/README

@@ -99,7 +99,7 @@ There is a compatibility wrapper for legacy applications called Memcached::Rails
   
 == Benchmarks
 
-<b>memcached</b> is up to 150x faster than <b>memcache-client</b>, and up to 15x faster than <b>caffeine</b>. See BENCHMARKS[link:files/BENCHMARKS.html] for details.
+<b>memcached</b> is up to 10x faster than <b>memcache-client</b>. See BENCHMARKS[link:files/BENCHMARKS.html] for details.
 
 == Reporting problems
 

data/ext/extconf.rb

@@ -27,7 +27,7 @@ if !ENV["EXTERNAL_LIB"]
       raise "'#{cmd}' failed" unless system(cmd)
 
       Dir.chdir(BUNDLE_PATH) do
-        puts(cmd = "env CFLAGS=-fPIC LDFLAGS=-fPIC ./configure --prefix=#{HERE} --disable-shared --disable-utils 2>&1")
+        puts(cmd = "env CFLAGS=-fPIC LDFLAGS=-fPIC ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
         puts(cmd = "make || true 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
@@ -40,8 +40,8 @@ if !ENV["EXTERNAL_LIB"]
   
   # Absolutely prevent the linker from picking up any other libmemcached
   Dir.chdir("#{HERE}/lib") do
-    system("cp libmemcached.a libmemcached_gem.a") 
-    system("cp libmemcached.la libmemcached_gem.la") 
+    system("cp -f libmemcached.a libmemcached_gem.a") 
+    system("cp -f libmemcached.la libmemcached_gem.la") 
   end
   $LIBS << " -lmemcached_gem"
 end

data/lib/memcached/exceptions.rb

@@ -21,9 +21,11 @@ Subclasses correspond one-to-one with server response strings or libmemcached er
 * Memcached::ConnectionFailure
 * Memcached::ConnectionSocketCreateFailure
 * Memcached::CouldNotOpenUnixSocket
+* Memcached::EncounteredAnUnknownStatKey
 * Memcached::Failure
 * Memcached::FetchWasNotCompleted
 * Memcached::HostnameLookupFailure
+* Memcached::ItemValue
 * Memcached::MemoryAllocationFailure
 * Memcached::NoServersDefined
 * Memcached::NotFound
@@ -39,6 +41,7 @@ Subclasses correspond one-to-one with server response strings or libmemcached er
 * Memcached::SomeErrorsWereReported
 * Memcached::StatValue
 * Memcached::SystemError
+* Memcached::TheHostTransportProtocolDoesNotMatchThatOfTheClient
 * Memcached::UnknownReadFailure
 * Memcached::WriteFailure
 

data/lib/memcached/memcached.rb

@@ -29,7 +29,8 @@ class Memcached
     :auto_eject_hosts => true,
     :server_failure_limit => 2,
     :verify_key => true,
-    :use_udp => false
+    :use_udp => false,
+    :binary_protocol => false
   }
 
 #:stopdoc:
@@ -69,6 +70,7 @@ Valid option parameters are:
 <tt>:default_weight</tt>:: The weight to use if <tt>:ketama_weighted</tt> is <tt>true</tt>, but no weight is specified for a server.
 <tt>:hash_with_prefix_key</tt>:: Whether to include the prefix when calculating which server a key falls on. Defaults to <tt>true</tt>.
 <tt>:use_udp</tt>:: Use the UDP protocol to reduce connection overhead. Defaults to false.
+<tt>:binary_protocol</tt>:: Use the binary protocol to reduce query processing overhead. Defaults to false.
 <tt>:sort_hosts</tt>:: Whether to force the server list to stay sorted. This defeats consistent hashing and is rarely useful.
 <tt>:verify_key</tt>:: Validate keys before accepting them. Never disable this.
 
@@ -314,21 +316,19 @@ Please note that when pipelining is enabled, setter and deleter methods do not r
       check_return_code(ret, keys)
 
       hash = {}
-      keys.size.times do
+      keys.each do
         value, key, flags, ret = Lib.memcached_fetch_rvalue(@struct)
         break if ret == Lib::MEMCACHED_END
         check_return_code(ret, key)
-        value = Marshal.load(value) if marshal
         # Assign the value
-        hash[key] = value
+        hash[key] = (marshal ? Marshal.load(value) : value)
       end
       hash
     else
       # Single get
       value, flags, ret = Lib.memcached_get_rvalue(@struct, keys)
       check_return_code(ret, keys)
-      value = Marshal.load(value) if marshal
-      value
+      marshal ? Marshal.load(value) : value
     end
   end
 

data/memcached.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.15.1"
+  s.version = "0.15.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
@@ -13,19 +13,18 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "README", "TODO"]
   s.files = ["BENCHMARKS", "CHANGELOG", "COMPATIBILITY", "ext/extconf.rb", "ext/libmemcached-0.31.tar.gz", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "lib/memcached.rb", "LICENSE", "Manifest", "memcached.gemspec", "Rakefile", "README", "test/profile/benchmark.rb", "test/profile/profile.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "TODO"]
-  s.has_rdoc = true
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{An interface to the libmemcached C client.}
   s.test_files = ["test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/test/profile/benchmark.rb

@@ -410,7 +410,7 @@ class Bench
           end
         end
         @m = Memcached.new(*@opt_unix)
-        x.report("missing:ruby:memcached_UDS:inline") do
+        x.report("missing:ruby:memcached:uds:inline") do
           n.times do
             @m.delete @key1 rescue nil
             @m.get @key1 rescue nil

data/test/unit/memcached_test.rb

@@ -260,6 +260,8 @@ class MemcachedTest < Test::Unit::TestCase
         result = cache.get key
       end
     end).real
+    
+    socket.close
   end
 
   def test_get_with_no_block_server_timeout
@@ -287,6 +289,8 @@ class MemcachedTest < Test::Unit::TestCase
         result = cache.get key
       end
     end).real
+
+    socket.close
   end
 
   def test_get_with_prefix_key
@@ -789,6 +793,7 @@ class MemcachedTest < Test::Unit::TestCase
 
   def test_unresponsive_server
     socket = stub_server 43041  
+    
     cache = Memcached.new(
       [@servers.last, 'localhost:43041'],
       :prefix_key => @prefix_key,
@@ -826,6 +831,8 @@ class MemcachedTest < Test::Unit::TestCase
     assert_raise(Memcached::ATimeoutOccurred) do
       cache.set(key2, @value)
     end        
+
+    socket.close
   end
 
   def test_missing_server
@@ -868,10 +875,34 @@ class MemcachedTest < Test::Unit::TestCase
     end        
   end
   
-  def test_missing_server_with_random_distribution
-    cache = Memcached.new(@servers, :distribution => :random)
-    # FIXME Needs to exercise the ejection code
-  end  
+  def test_unresponsive_with_random_distribution
+    socket = stub_server 43041
+    failures = [Memcached::ATimeoutOccurred, Memcached::ServerIsMarkedDead]
+
+    cache = Memcached.new(
+      [@servers.last, 'localhost:43041'],
+      :auto_eject_hosts => true,
+      :distribution => :random,
+      :server_failure_limit => 1,
+      :retry_timeout => 1
+    )
+
+    # Provoke the errors in 'failures'
+    exceptions = []
+    100.times { begin; cache.set key, @value; rescue => e; exceptions << e; end }
+    assert_equal failures, exceptions.map { |x| x.class }
+    
+    # Hit first server on retry
+    assert_nothing_raised { cache.set(key, @value) }    
+    
+    # Hit second server again after restore, expect same failures
+    sleep(2)
+    exceptions = []
+    100.times { begin; cache.set key, @value; rescue => e; exceptions << e; end }
+    assert_equal failures, exceptions.map { |x| x.class }    
+
+    socket.close
+  end
 
   def test_consistent_hashing
     keys = %w(EN6qtgMW n6Oz2W4I ss4A8Brr QShqFLZt Y3hgP9bs CokDD4OD Nd3iTSE1 24vBV4AU H9XBUQs5 E5j8vUq1 AzSh8fva PYBlK2Pi Ke3TgZ4I AyAIYanO oxj8Xhyd eBFnE6Bt yZyTikWQ pwGoU7Pw 2UNDkKRN qMJzkgo2 keFXbQXq pBl2QnIg ApRl3mWY wmalTJW1 TLueug8M wPQL4Qfg uACwus23 nmOk9R6w lwgZJrzJ v1UJtKdG RK629Cra U2UXFRqr d9OQLNl8 KAm1K3m5 Z13gKZ1v tNVai1nT LhpVXuVx pRib1Itj I1oLUob7 Z1nUsd5Q ZOwHehUa aXpFX29U ZsnqxlGz ivQRjOdb mB3iBEAj)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors: 
 - Evan Weaver
@@ -83,6 +83,8 @@ files:
 - TODO
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/memcached/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -109,9 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An interface to the libmemcached C client.
 test_files: 
 - test/test_helper.rb