slyphon-zookeeper 0.8.0.rc.1-java → 0.8.1-java

data/CHANGELOG

@@ -1,3 +1,36 @@
+v0.8.0 Refactor C implementaion, EventMachine client
+
+  * separated CZookeeper and ZookeeperBase implementation
+  
+    This solves issues with reopen not working properly, makes for a much
+    cleaner event delivery implementation. ZookeeperBase controls the lifecycle
+    of the event dispatch thread now, rather than it being tied to CZookeeper.
+  
+  * added support for the 'sync' API call
+  
+  * Refactored zookeeper_c.c and zookeeper_lib.c
+  
+    More error checking in zookeeper_lib.c and restructure some things to make
+    logic easier to follow
+  
+    Fix bug in method_get_next_event that made the shutdown case so complicated
+  
+  * Massively simplified EMClient implementation
+
+    Rather than trying to hook the IO used by zookeeper_lib to notify zookeeper_c
+    about event availabiltiy directly into EventMachine, use the same event delivery
+    thread, but wrap the dispatch call in EM.schedule.
+
+  * Improve implementation of spin-lock-esque code that waits for the connection to be
+    established before returning.
+
+    This cut the test runtime down from 1m 20s to 2s.
+
+  * Java client refactoring, similar correctness changes
+
+  * Change ZookeeperException base class to StandardError instead of Exception
+
+
 v0.4.5 Upgrade to ZooKeeper 3.3.3
 
 v0.4.4 Fix race condition on close, possible data corruption on async get.
@@ -24,3 +57,4 @@ v0.2. Bundle C dependencies, like memcached.gem.
 
 v0.1. First release.
 
+# vim:ft=text:ts=2:sw=2:et

data/ext/zookeeper_base.rb

@@ -56,7 +56,10 @@ class ZookeeperBase
       @watcher_reqs.clear
       set_default_global_watcher
 
-      @czk = CZookeeper.new(@host, @event_queue)
+      orig_czk, @czk = @czk, CZookeeper.new(@host, @event_queue)
+
+      orig_czk.close if orig_czk
+      
       @czk.wait_until_connected(timeout)
     end
 

data/java/zookeeper_base.rb

@@ -176,7 +176,7 @@ class ZookeeperBase
 
     @mutex.synchronize do
       # flushes all outstanding watcher reqs.
-      @watcher_reqs = {}
+      @watcher_reqs.clear
       set_default_global_watcher
 
       replace_jzk!
@@ -215,7 +215,7 @@ class ZookeeperBase
     # allows connected-state handlers to be registered before 
     yield self if block_given?
 
-    reopen(timeout, watcher)
+    reopen(timeout)
     return nil unless connected?
     @_running = true
     setup_dispatch_thread!

data/lib/zookeeper.rb

@@ -183,6 +183,16 @@ class Zookeeper < ZookeeperBase
   def associating?
     super
   end
+  
+  # There are some operations that are dangerous in the context of the event
+  # dispatch thread (because they would block further event delivery). This
+  # method allows clients to know if they're currently executing in the context of an
+  # event.
+  #
+  # @returns [true,false] true if the current thread is the event dispatch thread
+  def event_dispatch_thread?
+    super
+  end
 
   # for expert use only. set the underlying debug level for the C layer, has no
   # effect in java

data/lib/zookeeper/common.rb

@@ -4,6 +4,10 @@ module ZookeeperCommon
   # sigh, i guess define this here?
   ZKRB_GLOBAL_CB_REQ   = -1
 
+  def event_dispatch_thread?
+    @dispatcher && (@dispatcher == Thread.current)
+  end
+
 protected
   def get_next_event(blocking=true)
     @event_queue.pop(!blocking).tap do |event|

data/lib/zookeeper/em_client.rb

@@ -31,16 +31,24 @@ module ZookeeperEM
     end
 
     def dispatch_next_callback(hash)
-      EM.schedule { super(hash) }
+      EM.schedule do
+        if running? and not closed?
+          logger.debug { "#{self.class}##{__method__} dispatch_next_callback: #{hash.inspect}: reactor_thread? #{EM.reactor_thread?}, running? #{running?}, closed? #{closed?}" }
+          super(hash) 
+        end
+      end
     end
 
-    # this is synchronous, but since the API still allows attaching to on_close, 
-    # we just fake it here
     def close(&block)
-      on_close(&block).tap do |d|
-        super()
-        d.succeed
-      end
+      on_close(&block)
+      super()
+      on_close.succeed
+    end
+
+    # Because eventmachine is single-threaded, and events are dispatched on the
+    # reactor thread we just delegate this to EM.reactor_thread?
+    def event_dispatch_thread?
+      EM.reactor_thread?
     end
   end # Client
 end # ZookeeperEM

data/slyphon-zookeeper.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "slyphon-zookeeper"
-  s.version     = '0.8.0.rc.1'
+  s.version     = '0.8.1'
 
   s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
   s.email       = ["slyphon@gmail.com"]

data/spec/shared/connection_examples.rb

@@ -985,6 +985,23 @@ shared_examples_for "connection" do
       end
     end
   end
-end
 
+  describe :event_dispatch_thread? do
+    it %[should return true when called on the event dispatching thread] do
+      @result = nil
+
+      cb = lambda do |hash|
+        @result = zk.event_dispatch_thread?
+      end
+
+      @rv = zk.sync(:path => path, :callback => cb)
+
+      wait_until(2) { @result == true }.should be_true
+    end
+
+    it %[should return false when not on the event dispatching thread] do
+      zk.event_dispatch_thread?.should_not be_true
+    end
+  end
+end
 

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
 version: !ruby/object:Gem::Version 
-  hash: -1273384730
-  prerelease: 6
+  hash: 61
+  prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  - rc
   - 1
-  version: 0.8.0.rc.1
+  version: 0.8.1
 platform: java
 authors: 
 - Phillip Pearson
@@ -22,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-21 00:00:00 Z
+date: 2012-04-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -64,7 +62,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 305903719
+        hash: 3858962089
         segments: 
         - 1
         - 0
@@ -230,14 +228,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: