KellyMahan-memcachedb-client 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,9 @@
+= 1.1.1
+
+  merged changes from memcache-client 1.6.4
+  
+  "Add runtime check for unsafe multithreaded usage, to ward off bug reports."
+
 = 1.1
 
 added get_range method.

data/lib/memcache_db.rb

@@ -17,8 +17,7 @@ class MemCacheDb
   ##
   # The version of MemCacheDb you are using.
 
-  VERSION = '1.0.1'
-
+  VERSION = '1.1.1'
   ##
   # Default options for the cache object.
 
@@ -120,6 +119,8 @@ class MemCacheDb
 
     logger.info { "memcachedb-client #{VERSION} #{Array(servers).inspect}" } if logger
 
+    Thread.current[:memcachedb_client] = self.object_id if !@multithread
+
     self.servers = servers
   end
 
@@ -692,6 +693,8 @@ class MemCacheDb
   # failures (but does still apply to unexpectedly lost connections etc.).
 
   def with_socket_management(server, &block)
+    check_multithread_status!
+
     @mutex.lock if @multithread
     retried = false
 
@@ -783,6 +786,18 @@ class MemCacheDb
     ((total_servers * Continuum::POINTS_PER_SERVER * server.weight) / Float(total_weight)).floor
   end
 
+  def check_multithread_status!
+    return if @multithread
+
+    if Thread.current[:memcachedb_client] != self.object_id
+      raise MemCacheDbError, <<-EOM
+        You are accessing this memcachedb-client instance from multiple threads but have not enabled multithread support.
+        Normally:  MemCacheDb.new(['localhost:21201'], :multithread => true)
+        In Rails:  config.cache_store = [:mem_cache_db_store, 'localhost:21201', { :multithread => true }]
+      EOM
+    end
+  end
+
   ##
   # This class represents a memcachedb server instance.
 

data/test/test_mem_cache_db.rb

@@ -333,6 +333,32 @@ class TestMemCacheDb < Test::Unit::TestCase
     assert !server.alive?
   end
 
+  def test_multithread_error
+    server = FakeServer.new
+
+    # Write two messages to the socket to test failover
+    server.socket.data.write "bogus response\r\nbogus response\r\n"
+    server.socket.data.rewind
+
+    @cache.servers = []
+    @cache.servers << server
+
+    assert_nothing_raised do
+      @cache.set 'a', 1
+    end
+
+    passed = true
+    Thread.new do
+      begin
+        @cache.set 'b', 2
+        passed = false
+      rescue MemCacheDb::MemCacheError => me
+        passed = me.message =~ /multiple threads/
+      end
+    end
+    assert passed
+  end
+
   def test_initialize
     cache = MemCacheDb.new :namespace => 'my_namespace', :readonly => true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: KellyMahan-memcachedb-client
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Kelly Mahan