slyphon-zookeeper 0.9.3-java → 0.9.4-java

data/CHANGELOG

@@ -1,3 +1,10 @@
+v0.9.4 Fix shutdown timing bug
+
+  * Because we now release the GIL, ruby may call close while there's still
+    a pending synchronous call (since we give up the interpreter during that
+    time). Protect calls with a mutex so that close can only be called when
+    there isn't an in-flight call.
+
 v0.9.3 Event thread shutdown fix, Windows compatibility fix
 
   * Use a 'shutdown thread' to coordinate cleanup if close is called from the

data/Gemfile

@@ -2,6 +2,8 @@ source :rubygems
 
 gemspec
 
+gem 'rake', '~> 0.9.0'
+
 group :test do
   gem "rspec", "~> 2.8.0"
   gem 'flexmock', '~> 0.8.11'
@@ -10,7 +12,6 @@ group :test do
 end
 
 group :development do
-  gem 'rake', '~> 0.9.0'
   gem 'pry'
 end
 

data/Rakefile

@@ -4,12 +4,17 @@
 
 GEM_FILES = FileList['*zookeeper-*.gem']
 
+# need to releaase under both names until ZK is updated to use just 'zookeeper'
+GEM_NAMES = %w[zookeeper slyphon-zookeeper]
+
 namespace :mb do
   namespace :gems do
     task :build do
-      sh "rvm 1.8.7 do gem build zookeeper.gemspec"
-      ENV['JAVA_GEM'] = '1'
-      sh "rvm 1.8.7 do gem build zookeeper.gemspec"
+      GEM_NAMES.each do |gem_name|
+        ENV['JAVA_GEM'] = nil
+        sh "rvm 1.8.7 do env ZOOKEEPER_GEM_NAME='#{gem_name}' gem build zookeeper.gemspec"
+        sh "rvm 1.8.7 do env JAVA_GEM=1 ZOOKEEPER_GEM_NAME='#{gem_name}' gem build zookeeper.gemspec"
+      end
     end
 
     task :push => :build do
@@ -63,7 +68,7 @@ gemset_name = 'zookeeper'
   task clobber_task_name do
     unless rvm_ruby == 'jruby'
       cd 'ext' do
-        sh "rake clobber"
+        sh "rvm #{ruby_with_gemset} do bundle exec rake clobber"
       end
     end
   end
@@ -71,7 +76,7 @@ gemset_name = 'zookeeper'
   task clean_task_name do
     unless rvm_ruby == 'jruby'
       cd 'ext' do
-        sh "rake clean"
+        sh "rvm #{ruby_with_gemset} do bundle exec rake clean"
       end
     end
   end
@@ -79,7 +84,7 @@ gemset_name = 'zookeeper'
   task build_task_name => [create_gemset_name, clean_task_name] do
     unless rvm_ruby == 'jruby'
       cd 'ext' do
-        sh "rvm #{ruby_with_gemset} do rake build"
+        sh "rvm #{ruby_with_gemset} do bundle exec rake build"
       end
     end
   end
@@ -106,8 +111,6 @@ task "mb:test_all" do
   $stderr.puts "Test run took: #{t} s"
 end
 
-task :default => 'mb:1.9.3'
-
 task :clobber do
   rm_rf 'tmp'
 end
@@ -139,3 +142,23 @@ task :build do
   end
 end
 
+namespace :spec do
+  task :define do
+    require 'rubygems'
+    require 'bundler/setup'
+    require 'rspec/core/rake_task'
+
+    RSpec::Core::RakeTask.new('spec:runner') do |t|
+      t.rspec_opts = '-f d' if ENV['TRAVIS']
+    end
+
+    task 'spec:runner' => :build
+  end
+
+  task :run => :define do
+    Rake::Task['spec:runner'].invoke
+  end
+end
+
+task :default => 'spec:run'
+

data/ext/zookeeper_base.rb

@@ -26,8 +26,29 @@ class ZookeeperBase
   ZOO_LOG_LEVEL_INFO   = 3
   ZOO_LOG_LEVEL_DEBUG  = 4
 
-  def_delegators :czk, 
-    :get_children, :exists, :delete, :get, :set, :set_acl, :get_acl, :client_id, :sync, :selectable_io
+
+  # this is unfortunately necessary to prevent a really horrendous race in
+  # shutdown, where some other thread calls close in the middle of a
+  # synchronous operation (thanks to the GIL-releasing wrappers, we now
+  # have this problem). so we need to make sure only one thread can be calling
+  # a synchronous operation at a time. 
+  #
+  # this might be solved by waiting for a condition where there are no "in flight"
+  # operations (thereby allowing multiple threads to make requests simultaneously),
+  # but this would represent quite a bit of added complexity, and questionable
+  # performance gains.
+  #
+  def self.synchronized_delegation(provider, *syms)
+    syms.each do |sym|
+      class_eval(<<-EOM, __FILE__, __LINE__+1)
+        def #{sym}(*a, &b)
+          @mutex.synchronize { #{provider}.#{sym}(*a, &b) }
+        end
+      EOM
+    end
+  end
+
+  synchronized_delegation :@czk, :get_children, :exists, :delete, :get, :set, :set_acl, :get_acl, :client_id, :sync
 
   # some state methods need to be more paranoid about locking to ensure the correct
   # state is returned
@@ -90,17 +111,13 @@ class ZookeeperBase
 
     reopen(timeout)
   end
-
-  # synchronized accessor to the @czk instance
-  # @private
-  def czk
-    @mutex.synchronize { @czk }
-  end
-  
+ 
   # if either of these happen, the user will need to renegotiate a connection via reopen
   def assert_open
-    raise ZookeeperException::SessionExpired if state == ZOO_EXPIRED_SESSION_STATE
-    raise ZookeeperException::NotConnected   unless connected?
+    @mutex.synchronize do
+      raise ZookeeperException::SessionExpired if state == ZOO_EXPIRED_SESSION_STATE
+      raise ZookeeperException::NotConnected   unless connected?
+    end
   end
 
   def close
@@ -118,7 +135,7 @@ class ZookeeperBase
   # is pretty damn annoying. this is used to clean things up.
   def create(*args)
     # since we don't care about the inputs, just glob args
-    rc, new_path = czk.create(*args)
+    rc, new_path = @mutex.synchronize { @czk.create(*args) }
     [rc, strip_chroot_from(new_path)]
   end
 
@@ -139,15 +156,19 @@ class ZookeeperBase
 
   def state
     return ZOO_CLOSED_STATE if closed?
-    czk.state
+    @mutex.synchronize { @czk.state }
   end
 
   def session_id
-    cid = client_id and cid.session_id
+    @mutex.synchronize do
+      cid = client_id and cid.session_id
+    end
   end
 
   def session_passwd
-    cid = client_id and cid.passwd
+    @mutex.synchronize do
+      cid = client_id and cid.passwd
+    end
   end
 
   # we are closed if there is no @czk instance or @czk.closed?

data/lib/zookeeper/version.rb

@@ -1,6 +1,6 @@
 # this "namespacing" is retarded. fix this in 1.0
 # @private
 module ZookeeperVersion
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
   DRIVER_VERSION = '3.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slyphon-zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-03 00:00:00 Z
+date: 2012-05-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: slyphon-log4j