zookeeper 1.4.4-java → 1.4.6-java

data/lib/zookeeper/acls.rb

@@ -26,11 +26,11 @@ module ACLs
   end
   
   module Constants
-    ZOO_PERM_READ   = 0
-    ZOO_PERM_WRITE  = 1
-    ZOO_PERM_CREATE = 2
-    ZOO_PERM_DELETE = 4
-    ZOO_PERM_ADMIN  = 8
+    ZOO_PERM_READ   = 1 << 0
+    ZOO_PERM_WRITE  = 1 << 1
+    ZOO_PERM_CREATE = 1 << 2
+    ZOO_PERM_DELETE = 1 << 3
+    ZOO_PERM_ADMIN  = 1 << 4
     ZOO_PERM_ALL    = ZOO_PERM_READ | ZOO_PERM_WRITE | ZOO_PERM_CREATE | ZOO_PERM_DELETE | ZOO_PERM_ADMIN
     
     ZOO_ANYONE_ID_UNSAFE = Id.new(:scheme => "world", :id => "anyone")

data/lib/zookeeper/client_methods.rb

@@ -9,12 +9,12 @@ module ClientMethods
   def_delegators :@req_registry, :setup_call
   private :setup_call
 
-  def reopen(timeout=10, watcher=nil)
+  def reopen(timeout=10, watcher=nil, opts = {})
     warn "WARN: ZookeeperBase#reopen watcher argument is now ignored" if watcher
     super
   end
 
-  def initialize(host, timeout=10, watcher=nil)
+  def initialize(host, timeout=10, watcher=nil, opts = {})
     super
   end
 

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.4.4'
-  DRIVER_VERSION = '3.3.5'
+  VERSION = '1.4.6'
+  DRIVER_VERSION = '3.4.5'
 end

data/spec/shared/connection_examples.rb

@@ -441,6 +441,35 @@ shared_examples_for "connection" do
     end
   end
 
+  describe :child_watcher_behavior do
+    describe :async_watch, :async => true do
+      it_should_behave_like "all success return values"
+
+      before do
+        @watcher = Zookeeper::Callbacks::WatcherCallback.new
+        @cb = Zookeeper::Callbacks::StringsCallback.new
+
+        @rv = zk.get_children(:path => path, :watcher => @watcher, :watcher_context => path, :callback => @cb, :callback_context => path)
+        wait_until { @cb.completed? }
+        @cb.should be_completed
+      end
+
+      it %[should fire the watcher when the node has been deleted] do
+        @watcher.should_not be_completed
+
+        zk.delete(:path => path)[:rc].should == Zookeeper::ZOK
+
+        wait_until { @watcher.completed? }
+        @watcher.should be_completed
+
+        @watcher.path.should == path
+        @watcher.context.should == path
+        @watcher.type.should == Zookeeper::ZOO_DELETED_EVENT
+      end
+    end
+  end
+
+
   # NOTE: the jruby version of stat on non-existent node will have a
   # return_code of 0, but the C version will have a return_code of -101
   describe :stat do

data/spec/support/progress_formatter.rb

@@ -5,7 +5,7 @@ module RSpec
     module Formatters
       class ProgressFormatter
         def example_started(example)
-          SpecGlobalLogger.logger << yellow("\n=====<([ #{example.full_description} ])>=====\n")
+          SpecGlobalLogger.logger << pending_color("\n=====<([ #{example.full_description} ])>=====\n")
           super(example)
         end
       end

data/zoomonkey/duplicates

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+awk '{ if (prev == $0) count++; else { if (count > 0) { print " --- Line repeated " count " times --- " } print; prev = $0; count = 0 } }' $*

data/zoomonkey/zoomonkey.rb

@@ -0,0 +1,194 @@
+require 'zookeeper'
+require 'zk-server'
+require 'fileutils'
+require 'tmpdir'
+
+SLEEP_TIME = 30
+STDOUT.sync = true
+
+if ENV['DEBUG']
+  def zookeeper_logger(from)
+    l = Logger.new(STDOUT)
+    l.formatter = proc do |sev, time, c, msg|
+      "t=#{time.to_i} from=#{from} level=#{sev.downcase} message=#{msg.inspect}\n"
+    end
+    l
+  end
+
+  Zookeeper.logger = zookeeper_logger('zookeeper')
+  Zookeeper.set_debug_level(Zookeeper::ZOO_LOG_LEVEL_DEBUG)
+end
+
+class Worker
+  def initialize(body = nil, &block)
+    raise ArgumentError, "Cannot include both body and block" if body && block
+    @body = body || block
+  end
+
+  def body
+    @body || method(:call)
+  end
+
+  def start
+    @thread = Thread.new do
+      Thread.current.abort_on_exception = true
+      body.call
+    end
+  end
+
+  def stop
+    if @thread
+      @thread.kill
+      @thread = nil
+    end
+  end
+
+  def join
+    if @thread
+      @thread.join
+    end
+  end
+end
+
+
+
+base_dir = Dir.mktmpdir('zk-server-cluster')
+num_cluster = 3
+cluster = ZK::Server::Cluster.new(num_cluster, :base_dir => base_dir)
+
+class Reader < Worker
+  attr_reader :client
+
+  def initialize(zookeeper_hosts)
+    @zookeeper_hosts = zookeeper_hosts
+    @log_from = :reader
+  end
+
+  def call
+    @client = Zookeeper.new(@zookeeper_hosts, 10, method(:watcher))
+    client.wait_until_connected
+
+    client.create(:path => "/test", :data => '') rescue client.set(:path => "/test", :data => '')
+
+    while true
+      error = nil
+      t = Benchmark.realtime do
+        begin
+          client.get(:path => "/test")
+        rescue => e
+          error = e
+        end
+      end
+
+      msg = "host=#{client.connected_host || 'nil'} session_id=#{client.session_id} state=#{client.state_by_value(client.state)} time=#{"%0.4f" % t}"
+      if error
+        msg << " error=#{error.class} error_message=#{error.to_s.inspect}"
+        msg << " closed=#{client.closed?} running=#{client.running?} shutting_down=#{client.shutting_down?}"
+      end
+
+      log msg
+
+      sleep 1
+    end
+  end
+
+  def log(message)
+    puts "t=#{Time.now.to_i} from=#{@log_from} #{message}\n"
+  end
+
+  def watcher(event)
+    if event[:state] == Zookeeper::ZOO_EXPIRED_SESSION_STATE
+      if client
+        log "action=reconnecting state=#{client.state_by_value(event[:state])} session_id=#{client.session_id}"
+        client.reopen
+      end
+    end
+
+  end
+end
+
+class Writer < Worker
+  def initialize(zookeeper_hosts)
+    @zookeeper_hosts = zookeeper_hosts
+    @log_from = :writer
+  end
+
+  def call
+    client = Zookeeper.new(@zookeeper_hosts)
+    client.wait_until_connected
+
+    while true
+      error = nil
+      t = Benchmark.realtime do
+        begin
+          client.create(:path => "/test", :data => '') rescue client.set(:path => "/test", :data => '')
+        rescue => e
+          error = e
+        end
+      end
+
+      msg = "host=#{client.connected_host || 'nil'} session_id=#{client.session_id} state=#{client.state_by_value(client.state)} time=#{"%0.4f" % t}"
+      msg << " error=#{error.class} error_message=#{error.to_s.inspect}" if error
+      log msg
+
+      sleep 1
+    end
+  end
+
+  def log(message)
+    puts "t=#{Time.now.to_i} from=#{@log_from} #{message}\n"
+  end
+end
+
+class ZooMonkey < Worker
+  attr_reader :cluster
+
+  def initialize(cluster)
+    @cluster = cluster
+    @log_from = :server
+  end
+
+  def call
+    while true
+      sleep SLEEP_TIME
+
+      cluster.processes.each do |server|
+        host = "127.0.0.1:#{server.client_port}"
+        log "host=#{host} pid=#{server.pid} action=pausing"
+        server.kill "STOP"
+        sleep SLEEP_TIME
+
+        log "host=#{host} pid=#{server.pid} action=resuming"
+        server.kill "CONT"
+        sleep SLEEP_TIME
+      end
+    end
+  end
+
+  def log(message)
+    puts "t=#{Time.now.to_i} from=#{@log_from} #{message}\n"
+  end
+end
+
+begin
+  cluster.run
+
+  zookeeper_hosts = cluster.processes.map { |p| "127.0.0.1:#{p.client_port}" }
+  zookeeper_spec  = (zookeeper_hosts * 2).join(',')
+
+  reader = Reader.new(zookeeper_spec)
+  reader.start
+
+  # writer = Writer.new(zookeeper_spec)
+  # writer.start
+
+  monkey = ZooMonkey.new(cluster)
+  monkey.start
+
+  reader.join
+  writer.join
+  monkey.join
+ensure
+  cluster.clobber!
+  FileUtils.remove_entry(base_dir)
+end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zookeeper
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 1.4.6
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 4
-  version: 1.4.4
 platform: java
-authors: 
+authors:
 - Phillip Pearson
 - Eric Maland
 - Evan Weaver
@@ -19,58 +14,61 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: slyphon-log4j
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 2
-        - 15
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.2.15
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: slyphon-zookeeper_jar
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.15
+- !ruby/object:Gem::Dependency
+  name: slyphon-zookeeper_jar
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 3
-        - 5
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 3.3.5
   type: :runtime
-  version_requirements: *id002
-description: |+
-  A low-level multi-Ruby wrapper around the ZooKeeper API bindings. For a
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.5
+description: ! 'A low-level multi-Ruby wrapper around the ZooKeeper API bindings.
+  For a
+
   friendlier interface, see http://github.com/slyphon/zk. Currently supported:
+
   MRI: {1.8.7, 1.9.2, 1.9.3}, JRuby: ~> 1.6.7, Rubinius: 2.0.testing, REE 1.8.7.
-  
-  This library uses version 3.3.5 of zookeeper bindings.
-  
-email: 
+
+
+  This library uses version 3.4.5 of zookeeper bindings.
+
+
+'
+email:
 - slyphon@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .ctags_paths
+- .dotfiles/ruby-gemset
+- .dotfiles/ruby-version
 - .dotfiles/rvmrc
 - .gitignore
 - .gitmodules
@@ -93,8 +91,9 @@ files:
 - ext/event_lib.h
 - ext/extconf.rb
 - ext/generate_gvl_code.rb
-- ext/patch-zookeeper
-- ext/zkc-3.3.5.tar.gz
+- ext/patches/zkc-3.3.5-network.patch
+- ext/patches/zkc-3.4.5-logging.patch
+- ext/zkc-3.4.5.tar.gz
 - ext/zkrb.c
 - ext/zkrb_wrapper.c
 - ext/zkrb_wrapper.h
@@ -144,41 +143,34 @@ files:
 - spec/support/zookeeper_spec_helpers.rb
 - spec/zookeeper_spec.rb
 - zookeeper.gemspec
+- zoomonkey/duplicates
+- zoomonkey/zoomonkey.rb
 homepage: https://github.com/slyphon/zookeeper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - java
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Apache ZooKeeper driver for Rubies
-test_files: 
+test_files:
 - spec/c_zookeeper_spec.rb
 - spec/chrooted_connection_spec.rb
 - spec/compatibilty_spec.rb
@@ -196,3 +188,4 @@ test_files:
 - spec/support/progress_formatter.rb
 - spec/support/zookeeper_spec_helpers.rb
 - spec/zookeeper_spec.rb
+has_rdoc: