zookeeper 1.4.9-java → 1.5.1-java

data/ext/patches/zkc-3.4.5-fetch-and-add.patch

@@ -0,0 +1,16 @@
+diff -ur zkc-3.4.5-orig/c/src/mt_adaptor.c zkc-3.4.5/c/src/mt_adaptor.c
+--- zkc-3.4.5-orig/c/src/mt_adaptor.c	2012-09-30 10:53:32.000000000 -0700
++++ zkc-3.4.5/c/src/mt_adaptor.c	2016-09-07 16:55:13.787553837 -0700
+@@ -484,11 +484,7 @@
+ {
+ #ifndef WIN32
+     int32_t result;
+-    asm __volatile__(
+-         "lock xaddl %0,%1\n"
+-         : "=r"(result), "=m"(*(int *)operand)
+-         : "0"(incr)
+-         : "memory");
++    result = __sync_fetch_and_add(operand, incr);
+    return result;
+ #else
+     volatile int32_t result;

data/ext/patches/zkc-3.4.5-out-of-order-ping.patch

@@ -0,0 +1,163 @@
+diff --git zkc-3.4.5-orig/c/src/zookeeper.c zkc-3.4.5/c/src/zookeeper.c
+index de58c62..2347ff4 100644
+--- zkc-3.4.5-orig/c/src/zookeeper.c
++++ zkc-3.4.5/c/src/zookeeper.c
+@@ -1167,25 +1167,20 @@ void free_completions(zhandle_t *zh,int callCompletion,int reason)
+             zh->outstanding_sync--;
+             destroy_completion_entry(cptr);
+         } else if (callCompletion) {
+-            if(cptr->xid == PING_XID){
+-                // Nothing to do with a ping response
+-                destroy_completion_entry(cptr);
+-            } else {
+-                // Fake the response
+-                buffer_list_t *bptr;
+-                h.xid = cptr->xid;
+-                h.zxid = -1;
+-                h.err = reason;
+-                oa = create_buffer_oarchive();
+-                serialize_ReplyHeader(oa, "header", &h);
+-                bptr = calloc(sizeof(*bptr), 1);
+-                assert(bptr);
+-                bptr->len = get_buffer_len(oa);
+-                bptr->buffer = get_buffer(oa);
+-                close_buffer_oarchive(&oa, 0);
+-                cptr->buffer = bptr;
+-                queue_completion(&zh->completions_to_process, cptr, 0);
+-            }
++            // Fake the response
++            buffer_list_t *bptr;
++            h.xid = cptr->xid;
++            h.zxid = -1;
++            h.err = reason;
++            oa = create_buffer_oarchive();
++            serialize_ReplyHeader(oa, "header", &h);
++            bptr = calloc(sizeof(*bptr), 1);
++            assert(bptr);
++            bptr->len = get_buffer_len(oa);
++            bptr->buffer = get_buffer(oa);
++            close_buffer_oarchive(&oa, 0);
++            cptr->buffer = bptr;
++            queue_completion(&zh->completions_to_process, cptr, 0);
+         }
+     }
+     a_list.completion = NULL;
+@@ -1526,7 +1521,6 @@ static struct timeval get_timeval(int interval)
+     rc = serialize_RequestHeader(oa, "header", &h);
+     enter_critical(zh);
+     gettimeofday(&zh->last_ping, 0);
+-    rc = rc < 0 ? rc : add_void_completion(zh, h.xid, 0, 0);
+     rc = rc < 0 ? rc : queue_buffer_bytes(&zh->to_send, get_buffer(oa),
+             get_buffer_len(oa));
+     leave_critical(zh);
+@@ -2063,12 +2057,8 @@ static void deserialize_response(int type, int xid, int failed, int rc, completi
+     case COMPLETION_VOID:
+         LOG_DEBUG(("Calling COMPLETION_VOID for xid=%#x failed=%d rc=%d",
+                     cptr->xid, failed, rc));
+-        if (xid == PING_XID) {
+-            // We want to skip the ping
+-        } else {
+-            assert(cptr->c.void_result);
+-            cptr->c.void_result(rc, cptr->data);
+-        }
++        assert(cptr->c.void_result);
++        cptr->c.void_result(rc, cptr->data);
+         break;
+     case COMPLETION_MULTI:
+         LOG_DEBUG(("Calling COMPLETION_MULTI for xid=%#x failed=%d rc=%d",
+@@ -2184,7 +2174,15 @@ int zookeeper_process(zhandle_t *zh, int events)
+             // fprintf(stderr, "Got %#x for %#x\n", hdr.zxid, hdr.xid);
+         }
+ 
+-        if (hdr.xid == WATCHER_EVENT_XID) {
++        if (hdr.xid == PING_XID) {
++            // Ping replies can arrive out-of-order
++            int elapsed = 0;
++            struct timeval now;
++            gettimeofday(&now, 0);
++            elapsed = calculate_interval(&zh->last_ping, &now);
++            LOG_DEBUG(("Got ping response in %d ms", elapsed));
++            free_buffer(bptr);
++        } else if (hdr.xid == WATCHER_EVENT_XID) {
+             struct WatcherEvent evt;
+             int type = 0;
+             char *path = NULL;
+@@ -2250,22 +2248,9 @@ int zookeeper_process(zhandle_t *zh, int events)
+             activateWatcher(zh, cptr->watcher, rc);
+ 
+             if (cptr->c.void_result != SYNCHRONOUS_MARKER) {
+-                if(hdr.xid == PING_XID){
+-                    int elapsed = 0;
+-                    struct timeval now;
+-                    gettimeofday(&now, 0);
+-                    elapsed = calculate_interval(&zh->last_ping, &now);
+-                    LOG_DEBUG(("Got ping response in %d ms", elapsed));
+-
+-                    // Nothing to do with a ping response
+-                    free_buffer(bptr);
+-                    destroy_completion_entry(cptr);
+-                } else {
+-                    LOG_DEBUG(("Queueing asynchronous response"));
+-
+-                    cptr->buffer = bptr;
+-                    queue_completion(&zh->completions_to_process, cptr, 0);
+-                }
++                LOG_DEBUG(("Queueing asynchronous response"));
++                cptr->buffer = bptr;
++                queue_completion(&zh->completions_to_process, cptr, 0);
+             } else {
+                 struct sync_completion
+                         *sc = (struct sync_completion*)cptr->data;
+diff --git zkc-3.4.5-orig/c/tests/TestOperations.cc zkc-3.4.5/c/tests/TestOperations.cc
+index b0370e9..27d9270 100644
+--- zkc-3.4.5-orig/c/tests/TestOperations.cc
++++ zkc-3.4.5/c/tests/TestOperations.cc
+@@ -29,6 +29,7 @@ class Zookeeper_operations : public CPPUNIT_NS::TestFixture
+     CPPUNIT_TEST_SUITE(Zookeeper_operations);
+ #ifndef THREADED
+     CPPUNIT_TEST(testPing);
++    CPPUNIT_TEST(testUnsolicitedPing);
+     CPPUNIT_TEST(testTimeoutCausedByWatches1);
+     CPPUNIT_TEST(testTimeoutCausedByWatches2);
+ #else    
+@@ -305,6 +306,40 @@ public:
+         CPPUNIT_ASSERT_EQUAL(1,zkServer.pingCount_);
+     }
+ 
++    // ZOOKEEPER-2253: Permit unsolicited pings
++    void testUnsolicitedPing()
++    {
++        const int TIMEOUT=9; // timeout in secs
++        Mock_gettimeofday timeMock;
++        PingCountingServer zkServer;
++        // must call zookeeper_close() while all the mocks are in scope
++        CloseFinally guard(&zh);
++
++        // receive timeout is in milliseconds
++        zh=zookeeper_init("localhost:1234",watcher,TIMEOUT*1000,TEST_CLIENT_ID,0,0);
++        CPPUNIT_ASSERT(zh!=0);
++        // simulate connected state
++        forceConnected(zh);
++
++        int fd=0;
++        int interest=0;
++        timeval tv;
++
++        int rc=zookeeper_interest(zh,&fd,&interest,&tv);
++        CPPUNIT_ASSERT_EQUAL((int)ZOK,rc);
++
++        // verify no ping sent
++        CPPUNIT_ASSERT(zkServer.pingCount_==0);
++
++        // we're going to receive a unsolicited PING response; ensure
++        // that the client has updated its last_recv timestamp
++        timeMock.tick(tv);
++        zkServer.addRecvResponse(new PingResponse);
++        rc=zookeeper_process(zh,interest);
++        CPPUNIT_ASSERT_EQUAL((int)ZOK,rc);
++        CPPUNIT_ASSERT(timeMock==zh->last_recv);
++    }
++
+     // simulate a watch arriving right before a ping is due
+     // assert the ping is sent nevertheless
+     void testTimeoutCausedByWatches1()

data/ext/zkrb.c

@@ -73,6 +73,17 @@
 #include "ruby/io.h"
 #endif
 
+#ifndef HAVE_RB_THREAD_FD_SELECT
+#define rb_fdset_t fd_set
+#define rb_fd_isset(n, f) FD_ISSET(n, f)
+#define rb_fd_init(f) FD_ZERO(f)
+#define rb_fd_zero(f)  FD_ZERO(f)
+#define rb_fd_set(n, f)  FD_SET(n, f)
+#define rb_fd_clr(n, f) FD_CLR(n, f)
+#define rb_fd_term(f)
+#define rb_thread_fd_select rb_thread_select
+#endif
+
 #include "zookeeper/zookeeper.h"
 #include <errno.h>
 #include <stdio.h>
@@ -787,8 +798,8 @@ inline static int get_self_pipe_read_fd(VALUE self) {
 static VALUE method_zkrb_iterate_event_loop(VALUE self) {
   FETCH_DATA_PTR(self, zk);
 
-  fd_set rfds, wfds, efds;
-  FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&efds);
+  rb_fdset_t rfds, wfds, efds;
+  rb_fd_init(&rfds); rb_fd_init(&wfds); rb_fd_init(&efds);
 
   int fd = 0, interest = 0, events = 0, rc = 0, maxfd = 0, irc = 0, prc = 0;
   struct timeval tv;
@@ -797,14 +808,14 @@ static VALUE method_zkrb_iterate_event_loop(VALUE self) {
 
   if (fd != -1) {
     if (interest & ZOOKEEPER_READ) {
-      FD_SET(fd, &rfds);
+      rb_fd_set(fd, &rfds);
     } else {
-      FD_CLR(fd, &rfds);
+      rb_fd_clr(fd, &rfds);
     }
     if (interest & ZOOKEEPER_WRITE) {
-      FD_SET(fd, &wfds);
+      rb_fd_set(fd, &wfds);
     } else {
-      FD_CLR(fd, &wfds);
+      rb_fd_clr(fd, &wfds);
     }
   } else {
     fd = 0;
@@ -813,22 +824,22 @@ static VALUE method_zkrb_iterate_event_loop(VALUE self) {
   // add our self-pipe to the read set, allow us to wake up in case our attention is needed
   int pipe_r_fd = get_self_pipe_read_fd(self);
 
-  FD_SET(pipe_r_fd, &rfds);
+  rb_fd_set(pipe_r_fd, &rfds);
 
   maxfd = (pipe_r_fd > fd) ? pipe_r_fd : fd;
 
-  rc = rb_thread_select(maxfd+1, &rfds, &wfds, &efds, &tv);
+  rc = rb_thread_fd_select(maxfd+1, &rfds, &wfds, &efds, &tv);
 
   if (rc > 0) {
-    if (FD_ISSET(fd, &rfds)) {
+    if (rb_fd_isset(fd, &rfds)) {
       events |= ZOOKEEPER_READ;
     }
-    if (FD_ISSET(fd, &wfds)) {
+    if (rb_fd_isset(fd, &wfds)) {
       events |= ZOOKEEPER_WRITE;
     }
 
     // we got woken up by the self-pipe
-    if (FD_ISSET(pipe_r_fd, &rfds)) {
+    if (rb_fd_isset(pipe_r_fd, &rfds)) {
       // one event has awoken us, so we clear one event from the pipe
       char b[1];
 
@@ -853,6 +864,9 @@ static VALUE method_zkrb_iterate_event_loop(VALUE self) {
       prc, interest, fd, pipe_r_fd, maxfd, irc, tv.tv_sec + (tv.tv_usec/ 1000.0 / 1000.0));
   }
 
+  rb_fd_term(&rfds);
+  rb_fd_term(&wfds);
+  rb_fd_term(&efds);
   return INT2FIX(prc);
 }
 

data/java/java_base.rb

@@ -183,13 +183,11 @@ class JavaBase
   attr_reader :event_queue
 
   def reopen(timeout=10, watcher=nil, opts = {})
-#     watcher ||= @default_watcher
-
     @mutex.synchronize do
       @req_registry.clear_watchers!
 
       replace_jzk!(opts)
-      wait_until_connected
+      wait_until_connected(timeout)
     end
 
     state
@@ -490,7 +488,7 @@ class JavaBase
 
     def replace_jzk!(opts = {})
       orig_jzk = @jzk
-      if opts.has_key?(:session_id) && opts.has_key(:session_passwd)
+      if opts.has_key?(:session_id) && opts.has_key?(:session_passwd)
         @jzk = JZK::ZooKeeper.new(@host, DEFAULT_SESSION_TIMEOUT, JavaCB::WatcherCallback.new(event_queue, :client => self), opts.fetch(:session_id), opts.fetch(:session_passwd).to_java_bytes)
       else
         @jzk = JZK::ZooKeeper.new(@host, DEFAULT_SESSION_TIMEOUT, JavaCB::WatcherCallback.new(event_queue, :client => self))

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.4.9'
+  VERSION = '1.5.1'
   DRIVER_VERSION = '3.4.5'
 end

data/spec/forked_connection_spec.rb

@@ -4,7 +4,7 @@ unless defined?(::JRUBY_VERSION)
   describe %[forked connection] do
     let(:path) { "/_zktest_" }
     let(:pids_root) { "#{path}/pids" }
-    let(:data) { "underpants" } 
+    let(:data) { "underpants" }
     let(:connection_string) { Zookeeper.default_cnx_str }
 
     def process_alive?(pid)
@@ -15,7 +15,7 @@ unless defined?(::JRUBY_VERSION)
     end
 
     LBORDER = ('-' * 35) << '< '
-    RBORDER = ' >' << ('-' * 35) 
+    RBORDER = ' >' << ('-' * 35)
 
     def mark(thing)
       logger << "\n#{LBORDER}#{thing}#{RBORDER}\n\n"
@@ -25,8 +25,6 @@ unless defined?(::JRUBY_VERSION)
       mark "BEFORE: START"
       if defined?(::Rubinius)
         pending("this test is currently broken in rbx")
-#       elsif ENV['TRAVIS']
-#         pending("this test is currently hanging in travis")
       else
         @zk = Zookeeper.new(connection_string)
         rm_rf(@zk, path)
@@ -105,7 +103,7 @@ unless defined?(::JRUBY_VERSION)
       @zk.resume_after_fork_in_parent
 
       event_waiter_th = Thread.new do
-        @latch.await(5) unless @event 
+        @latch.await(5) unless @event
         @event
       end
 

data/spec/shared/connection_examples.rb

@@ -1051,7 +1051,11 @@ shared_examples_for "connection" do
           zk.close
         end
 
-        zk.stat(:path => path, :callback => evil_cb)
+        begin
+          zk.stat(:path => path, :callback => evil_cb)
+        rescue IOError
+          # captures flaky IOError: stream closed in another thread
+        end
 
         wait_until { zk.closed? }
         zk.should be_closed

data/spec/support/10_spawn_zookeeper.rb

@@ -3,10 +3,6 @@ module Zookeeper
     !!ENV['SPAWN_ZOOKEEPER']
   end
 
-  def self.travis?
-    !!ENV['TRAVIS']
-  end
-
   def self.default_cnx_host
     ENV['ZK_DEFAULT_HOST'] || 'localhost'
   end

data/zookeeper.gemspec

@@ -6,13 +6,21 @@ Gem::Specification.new do |s|
   s.name        = 'zookeeper'
   s.version     = Zookeeper::VERSION
 
-  s.authors     = ["Phillip Pearson", "Eric Maland", "Evan Weaver", "Brian Wickman", "Neil Conway", "Jonathan D. Simms"]
+  s.authors     = [
+    "Phillip Pearson", 
+    "Eric Maland", 
+    "Evan Weaver", 
+    "Brian Wickman", 
+    "Neil Conway",
+    "Jonathan D. Simms",
+    "Mal McKay",
+  ]
   s.email       = ["slyphon@gmail.com"]
   s.summary     = %q{Apache ZooKeeper driver for Rubies}
   s.description = <<-EOS
 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.
+MRI: {2.5, 2.6, 2.7, 3.0}, JRuby: ~> 9.2.x.x
 
 This library uses version #{Zookeeper::DRIVER_VERSION} of zookeeper bindings.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zookeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.5.1
 platform: java
 authors:
 - Phillip Pearson
@@ -10,64 +10,60 @@ authors:
 - Brian Wickman
 - Neil Conway
 - Jonathan D. Simms
-autorequire: 
+- Mal McKay
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: slyphon-log4j
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.15
-  type: :runtime
+  name: slyphon-log4j
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.15
 - !ruby/object:Gem::Dependency
-  name: slyphon-zookeeper_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.3.5
-  type: :runtime
+  name: slyphon-zookeeper_jar
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.3.5
-description: ! 'A low-level multi-Ruby wrapper around the ZooKeeper API bindings.
-  For a
-
+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.
-
+  MRI: {2.5, 2.6, 2.7, 3.0}, JRuby: ~> 9.2.x.x
 
   This library uses version 3.4.5 of zookeeper bindings.
 
-
-'
 email:
 - slyphon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .ctags_paths
-- .dotfiles/ruby-gemset
-- .dotfiles/ruby-version
-- .dotfiles/rvmrc
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".ctags_paths"
+- ".dotfiles/ruby-gemset"
+- ".dotfiles/ruby-version"
+- ".dotfiles/rvmrc"
+- ".github/workflows/build.yml"
+- ".gitignore"
+- ".gitmodules"
 - CHANGELOG
 - Gemfile
 - Guardfile
@@ -87,7 +83,11 @@ files:
 - ext/extconf.rb
 - ext/generate_gvl_code.rb
 - ext/patches/zkc-3.3.5-network.patch
+- ext/patches/zkc-3.4.5-buffer-overflow.patch
+- ext/patches/zkc-3.4.5-config.patch
+- ext/patches/zkc-3.4.5-fetch-and-add.patch
 - ext/patches/zkc-3.4.5-logging.patch
+- ext/patches/zkc-3.4.5-out-of-order-ping.patch
 - ext/patches/zkc-3.4.5-yosemite-htonl-fix.patch
 - ext/zkc-3.4.5.tar.gz
 - ext/zkrb.c
@@ -144,25 +144,25 @@ files:
 homepage: https://github.com/slyphon/zookeeper
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - java
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.9
+signing_key:
 specification_version: 4
 summary: Apache ZooKeeper driver for Rubies
 test_files:

data/.travis.yml

@@ -1,37 +0,0 @@
----
-notifications:
-  email:
-    - slyphon@gmail.com
-    - eric@5stops.com
-
-# pull in releaseops submodule
-before_install:
-  - git submodule update --init --recursive
-
-env:
-  - SPAWN_ZOOKEEPER='true'
-
-language: ruby
-
-rvm:
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - ree
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - 2.0.0
-matrix:
-  allow_failures:
-    - rvm: rbx-18mode
-    - rvm: rbx-19mode
-
-bundler_args: --without development docs coverage
-
-# blacklist
-branches:
-  except:
-#     - 'dev/zookeeper-st'
-