zookeeper 1.4.8-java → 1.5.0-java

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 685552eca5c4354d806942534b167347942cf401f730cfcaf513acb012752d1a
+  data.tar.gz: 287a77f92a9b0837f95bfe571b797d48f794c01a823ba26870fe1f748605bbcd
+SHA512:
+  metadata.gz: 2ac56db44459c3e4112559679363f99ff391795c38b4fb5fd5be081ebd2debfd505cc11c4e6d34d898caa39a68dfd36519d8d8c6205e7d34d15ba229a3e6ee68
+  data.tar.gz: 7d20d7af6bee9fd1d191b6f8094cf6fc59a097469ba2ccc375120f99b5bc5a4175ea6b714f6587da55c31ae5ca2842372a74a85e6c7a9871cd0f910c1355b61c

data/.github/workflows/build.yml

@@ -0,0 +1,55 @@
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Ruby ${{ matrix.ruby }} / GCC ${{ matrix.gcc }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+          - 3.0
+          - jruby
+        gcc:
+          - 7
+          - latest
+        exclude:
+          - os: macos-latest
+            gcc: 7
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Set up GCC
+        if: ${{ matrix.gcc != 'latest' }}
+        uses: egor-tensin/setup-gcc@v1
+        with:
+          version: ${{ matrix.gcc }}
+          platform: x64
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run Tests
+        env:
+          RAILS_ENV: test
+          SPAWN_ZOOKEEPER: true
+        run: |
+          bundle exec rake

data/CHANGELOG

@@ -1,3 +1,24 @@
+v1.5.0
+  * (housekeeping) Moves build to Github Actions from TravisCI
+  * (housekeeping) Drops build support for MRI Ruby < 2.5 and other rubies
+  * Build on Ruby 3 (#99) (h/t: @malmckay)
+  * Build on MacOS (#98) (h/t: @malmckay)
+  * Work around compiler errors on newer versions of gcc (#97) (h/t: @nickmarden)
+  * Fix a typo on a has_key (#83) (h/t: @lexspoon)
+  * Adds support macOS dylib (#86) (h/t: @pftg)
+  * Fix compilation on ARM (#82) (h/t: @cdonati)
+
+v1.4.11
+  * backported fix for ZOOKEEPER-2253 by @chchen - #76
+
+v1.4.10
+
+  * fix for ruby 2.2.0 build - #74 (h/t: fbernier)
+
+v1.4.9
+
+  * Fix for build on OS-X 10.10 by @e0en
+
 v1.4.8
 
   * Fix deadlock related to state checks that can happen during reconnecting

data/Gemfile

@@ -6,7 +6,7 @@ gem 'rake', '~> 0.9.0'
 
 group :test do
   gem "rspec" , "~> 2.11"
-  gem 'eventmachine', '1.0.0'
+  gem 'eventmachine', '1.0.4'
   gem 'evented-spec', '~> 0.9.0'
   gem 'zk-server', '~> 1.0', :git => 'https://github.com/zk-ruby/zk-server.git'
 end

data/README.markdown

@@ -1,6 +1,7 @@
 # zookeeper #
 
-[![Build Status](https://secure.travis-ci.org/zk-ruby/zookeeper.png?branch=master)](http://travis-ci.org/zk-ruby/zookeeper)
+![Build Status](https://github.com/zk-ruby/zookeeper/actions/workflows/build.yml/badge.svg)
+
 
 An interface to the Zookeeper cluster coordination server.
 
@@ -10,14 +11,10 @@ For a higher-level interface with a more convenient API and features such as loc
 
 As of 1.1.0, this library is fork-safe (which was not easy to accomplish). This means you can use it without worry in unicorn, resque, and whatever other fork-philic frameworks you sick little monkeys are using this week. The only rule is that after a fork(), you need to call `#reopen` on the client ASAP, because if you try to peform any other action, an exception will be raised. Other than that, there is no special action that is needed in the parent.
 
-## Big Plans for 1.0 ##
-
-The 1.0 release will feature a reorganization of the heirarchy. There will be a single top-level `Zookeeper` namespace (as opposed to the current layout, with 5-6 different top-level constants), and for the next several releases, there will be a backwards compatible require for users that still need to use the old names.
-
 ## License
 
-Copyright 2008 Phillip Pearson, and 2010 Twitter, Inc. 
-Licensed under the MIT License.  See the included LICENSE file.  
+Copyright 2008 Phillip Pearson, and 2010 Twitter, Inc.
+Licensed under the MIT License.  See the included LICENSE file.
 
 Portions copyright 2008-2010 the Apache Software Foundation, licensed under the
 Apache 2 license, and used with permission.
@@ -28,26 +25,6 @@ Portions contributed to the open source community by HPDC, L.P.
 
 sudo gem install zookeeper
 
-### rbenv is awesome
-
-UPDATE: this appears to have been fixed by @eric in [this patch](http://git.io/PEPgnA). If you use rbenv, please report any issues, but I believe it should work now.
-
-Let me start out by saying I prefer rvm, and that I really don't know a whole lot about linking on OS X. Or Linux. Any suggestions or constructive insults would be greatly appreciated if you have insight into what i'm doing wrong here.
-
-So, it seems that [ruby-build][] doesn't use `--enable-shared` by default. I'm told this is for speed. 
-
-If you run into problems with installing this gem (specifically with linking ex. `Undefined symbols for architecture x86_64`) and you're using rbenv, for now you need to ensure that your ruby was built with `--enable-shared`. I'm sorry for the inconvenience. (no, really)
-
-```shell
-~ $ CONFIGURE_OPTS='--enable-shared --disable-install-doc' rbenv install 1.9.3-p194
-```
-
-[ruby-build]: https://github.com/sstephenson/ruby-build
-
-### A note for REE users
-
-The zookeeper client is required to send a heartbeat packet every N seconds to the server. If it misses its deadline 3 times in a row, the session will be lost. The way the client is implemented in versions `>= 1.2`, a *ruby* thread acts as the event thread (this was necessary to provide a fork-safe client with a parent process that is able to preserve state). Some users have reported issues where under load in "massive codebases," they have problems where calls will time out. Given the nature of the thread scheduler in 1.8, one should be careful if upgrading from `0.4.4` to `>= 1.2`.
-
 ## Usage
 
 Connect to a server:
@@ -75,7 +52,7 @@ Calls take a dictionary of parameters. With the exception of set\_acl, the only
 
 ### A Bit about this repository ###
 
-Twitter's open source office was kind enough to transfer this repository to facilitate development and administration of this repository. The `zookeeper` gem's last three releases were recorded in branches `v0.4.2`, `v0.4.3` and `v0.4.4`. Releases of the `slyphon-zookeeper` gem were cut off of the fork, and unfortunately (due to an oversight on my part) were tagged with unrelated versions. Those were tagged with names `release/0.9.2`. 
+Twitter's open source office was kind enough to transfer this repository to facilitate development and administration of this repository. The `zookeeper` gem's last three releases were recorded in branches `v0.4.2`, `v0.4.3` and `v0.4.4`. Releases of the `slyphon-zookeeper` gem were cut off of the fork, and unfortunately (due to an oversight on my part) were tagged with unrelated versions. Those were tagged with names `release/0.9.2`.
 
 The plan is to keep the `slyphon-zookeeper` tags, and to tag the `zookeeper` releases `twitter/release/0.4.x`.
 

data/Rakefile

@@ -38,7 +38,7 @@ if File.exists?(release_ops_path)
 
           orig_dir = Dir.getwd
 
-          cd tmpdir do
+          Dir.chdir tmpdir do
             sh "git co #{tag} && git reset --hard && git clean -fdx"
 
             ENV['JAVA_GEM'] = nil
@@ -77,7 +77,7 @@ end
 VALGRIND_BASIC_OPTS = '--num-callers=50 --error-limit=no --partial-loads-ok=yes --undef-value-errors=no --trace-children=yes'
 
 task 'valgrind' do
-  cd 'ext' do
+  Dir.chdir 'ext' do
     sh "rake clean build"
   end
 
@@ -86,7 +86,7 @@ end
 
 namespace :build do
   task :clean do
-    cd 'ext' do
+    Dir.chdir 'ext' do
       sh 'rake clean'
     end
 
@@ -94,7 +94,7 @@ namespace :build do
   end
 
   task :clobber do
-    cd 'ext' do
+    Dir.chdir 'ext' do
       sh 'rake clobber'
     end
 
@@ -104,7 +104,7 @@ end
 
 desc "Build C component"
 task :build do
-  cd 'ext' do
+  Dir.chdir 'ext' do
     sh "rake"
   end
 end

data/ext/c_zookeeper.rb

@@ -48,7 +48,7 @@ class CZookeeper
 
     # keep track of the pid that created us
     update_pid!
-    
+
     # used by the C layer. CZookeeper sets this to true when the init method
     # has completed. once this is set to true, it stays true.
     #
@@ -68,7 +68,7 @@ class CZookeeper
     @_receive_timeout_msec = opts[:receive_timeout_msec] || DEFAULT_RECEIVE_TIMEOUT_MSEC
 
     @mutex = Monitor.new
-    
+
     # used to signal that we're running
     @running_cond = @mutex.new_cond
 
@@ -80,7 +80,7 @@ class CZookeeper
     @state = ZOO_CLOSED_STATE
 
     @pipe_read, @pipe_write = IO.pipe
-    
+
     @event_thread = nil
 
     # hash of in-flight Continuation instances
@@ -142,7 +142,7 @@ class CZookeeper
 
     nil
   end
-  
+
   # call this to stop the event loop, you can resume with the
   # resume method
   #
@@ -157,7 +157,7 @@ class CZookeeper
   def resume_after_fork_in_parent
     logger.debug { "##{__method__}" }
 
-    @mutex.synchronize do 
+    @mutex.synchronize do
       @_shutting_down = nil
       start_event_thread
     end
@@ -181,7 +181,7 @@ class CZookeeper
     return false unless wait_until_running(timeout)
 
     @state_mutex.synchronize do
-      while true 
+      while true
         if timeout
           now = Time.now
           break if (@state == ZOO_CONNECTED_STATE) || unhealthy? || (now > time_to_stop)
@@ -212,7 +212,7 @@ class CZookeeper
       !unhealthy?
     end
 
-    # submits a job for processing 
+    # submits a job for processing
     # blocks the caller until result has returned
     def submit_and_block(meth, *args)
       @mutex.synchronize do
@@ -230,9 +230,9 @@ class CZookeeper
       wake_event_loop!
       cnt.value
     end
-    
+
     # this method is part of the reopen/close code, and is responsible for
-    # shutting down the dispatch thread. 
+    # shutting down the dispatch thread.
     #
     # this method must be EXTERNALLY SYNCHRONIZED!
     #
@@ -243,7 +243,7 @@ class CZookeeper
         logger.debug { "##{__method__}" }
         shut_down!
         wake_event_loop!
-        @event_thread.join 
+        @event_thread.join
         @event_thread = nil
       end
     end
@@ -259,7 +259,7 @@ class CZookeeper
     # or until timeout seconds have passed.
     #
     # returns true if we're running, false if we timed out
-    def wait_until_running(timeout=5) 
+    def wait_until_running(timeout=5)
       @mutex.synchronize do
         return true if @_running
         @running_cond.wait(timeout)
@@ -279,7 +279,7 @@ class CZookeeper
           submit_pending_calls
         end
 
-        zkrb_iterate_event_loop 
+        zkrb_iterate_event_loop
         iterate_event_delivery
       end
 
@@ -328,7 +328,7 @@ class CZookeeper
     end
 
     def wake_event_loop!
-      @pipe_write && @pipe_write.write('1')
+      @pipe_write && !@pipe_write.closed? && @pipe_write.write('1')
     end
 
     def iterate_event_delivery
@@ -345,10 +345,10 @@ class CZookeeper
             end
           end
         end
-        
+
         cntn = @reg.in_flight.delete(hash[:req_id])
 
-        if cntn and not cntn.user_callback?     # this is one of "our" continuations 
+        if cntn and not cntn.user_callback?     # this is one of "our" continuations
           cntn.call(hash)                       # so we handle delivering it
           next                                  # and skip handing it to the dispatcher
         end
@@ -374,7 +374,7 @@ class CZookeeper
     def shut_down!
       logger.debug { "##{__method__}" }
 
-      @mutex.synchronize do 
+      @mutex.synchronize do
         @_shutting_down = true
         # ollie ollie oxen all home free!
         @running_cond.broadcast

data/ext/extconf.rb

@@ -68,7 +68,7 @@ Dir.chdir(HERE) do
     # clean up stupid apple rsrc fork bullshit
     FileUtils.rm_f(Dir['**/._*'].select{|p| test(?f, p)})
 
-    Dir.chdir(BUNDLE_PATH) do        
+    Dir.chdir(BUNDLE_PATH) do
       configure = "./configure --prefix=#{HERE} --with-pic --without-cppunit --disable-dependency-tracking #{$EXTRA_CONF} 2>&1"
       configure = "env CFLAGS='#{DEBUG_CFLAGS}' #{configure}" if ZK_DEBUG
 
@@ -84,14 +84,19 @@ end
 # Absolutely prevent the linker from picking up any other zookeeper_mt
 Dir.chdir("#{HERE}/lib") do
   %w[st mt].each do |stmt|
-    %w[a la].each do |ext|
-      system("cp -f libzookeeper_#{stmt}.#{ext} libzookeeper_#{stmt}_gem.#{ext}") 
+    %w[a la dylib].each do |ext|
+      origin_lib_name = "libzookeeper_#{stmt}.#{ext}"
+      dest_lib_name = "libzookeeper_#{stmt}_gem.#{ext}"
+      system("cp -f #{origin_lib_name} #{dest_lib_name}") if File.exists?(origin_lib_name)
     end
   end
 end
-$LIBS << " -lzookeeper_st_gem"
+
+# -lm must come after lzookeeper_st_gem to ensure proper link
+$LIBS << " -lzookeeper_st_gem -lm"
 
 have_func('rb_thread_blocking_region')
+have_func('rb_thread_fd_select')
 
 $CFLAGS << ' -Wall' if ZK_DEV
 create_makefile 'zookeeper_c'

data/ext/patches/zkc-3.4.5-buffer-overflow.patch

@@ -0,0 +1,11 @@
+--- zkc-3.4.5.orig/c/src/zookeeper.c	2020-08-13 03:04:49.631654715 -0400
++++ zkc-3.4.5/c/src/zookeeper.c	2020-08-13 03:03:24.983922697 -0400
+@@ -3411,7 +3411,7 @@
+ 
+ static const char* format_endpoint_info(const struct sockaddr_storage* ep)
+ {
+-    static char buf[128];
++    static char buf[128+6];
+     char addrstr[128];
+     void *inaddr;
+ #ifdef WIN32

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/patches/zkc-3.4.5-yosemite-htonl-fix.patch

@@ -0,0 +1,102 @@
+diff -ur zkc-3.4.5-orig/c/include/recordio.h zkc-3.4.5/c/include/recordio.h
+--- zkc-3.4.5-orig/c/include/recordio.h	2012-09-30 13:53:32.000000000 -0400
++++ zkc-3.4.5/c/include/recordio.h	2014-07-29 03:13:27.000000000 -0400
+@@ -73,7 +73,7 @@
+ char *get_buffer(struct oarchive *);
+ int get_buffer_len(struct oarchive *);
+ 
+-int64_t htonll(int64_t v);
++int64_t zk_htonll(int64_t v);
+ 
+ #ifdef __cplusplus
+ }
+diff -ur zkc-3.4.5-orig/c/src/recordio.c zkc-3.4.5/c/src/recordio.c
+--- zkc-3.4.5-orig/c/src/recordio.c	2012-09-30 13:53:32.000000000 -0400
++++ zkc-3.4.5/c/src/recordio.c	2014-07-29 03:13:35.000000000 -0400
+@@ -80,7 +80,7 @@
+     priv->off+=sizeof(i);
+     return 0;
+ }
+-int64_t htonll(int64_t v)
++int64_t zk_htonll(int64_t v)
+ {
+     int i = 0;
+     char *s = (char *)&v;
+@@ -98,7 +98,7 @@
+ 
+ int oa_serialize_long(struct oarchive *oa, const char *tag, const int64_t *d)
+ {
+-    const int64_t i = htonll(*d);
++    const int64_t i = zk_htonll(*d);
+     struct buff_struct *priv = oa->priv;
+     if ((priv->len - priv->off) < sizeof(i)) {
+         int rc = resize_buffer(priv, priv->len + sizeof(i));
+@@ -207,7 +207,7 @@
+     }
+     memcpy(count, priv->buffer+priv->off, sizeof(*count));
+     priv->off+=sizeof(*count);
+-    v = htonll(*count); // htonll and  ntohll do the same
++    v = zk_htonll(*count); // zk_htonll and  ntohll do the same
+     *count = v;
+     return 0;
+ }
+diff -ur zkc-3.4.5-orig/c/src/zookeeper.c zkc-3.4.5/c/src/zookeeper.c
+--- zkc-3.4.5-orig/c/src/zookeeper.c	2012-09-30 13:53:32.000000000 -0400
++++ zkc-3.4.5/c/src/zookeeper.c	2014-07-29 03:13:45.000000000 -0400
+@@ -1408,7 +1408,7 @@
+     memcpy(buffer + offset, &req->protocolVersion, sizeof(req->protocolVersion));
+     offset = offset +  sizeof(req->protocolVersion);
+ 
+-    req->lastZxidSeen = htonll(req->lastZxidSeen);
++    req->lastZxidSeen = zk_htonll(req->lastZxidSeen);
+     memcpy(buffer + offset, &req->lastZxidSeen, sizeof(req->lastZxidSeen));
+     offset = offset +  sizeof(req->lastZxidSeen);
+ 
+@@ -1416,7 +1416,7 @@
+     memcpy(buffer + offset, &req->timeOut, sizeof(req->timeOut));
+     offset = offset +  sizeof(req->timeOut);
+ 
+-    req->sessionId = htonll(req->sessionId);
++    req->sessionId = zk_htonll(req->sessionId);
+     memcpy(buffer + offset, &req->sessionId, sizeof(req->sessionId));
+     offset = offset +  sizeof(req->sessionId);
+ 
+@@ -1447,7 +1447,7 @@
+      memcpy(&req->sessionId, buffer + offset, sizeof(req->sessionId));
+      offset = offset +  sizeof(req->sessionId);
+ 
+-     req->sessionId = htonll(req->sessionId);
++     req->sessionId = zk_htonll(req->sessionId);
+      memcpy(&req->passwd_len, buffer + offset, sizeof(req->passwd_len));
+      offset = offset +  sizeof(req->passwd_len);
+ 
+diff -ur zkc-3.4.5-orig/c/tests/ZKMocks.cc zkc-3.4.5/c/tests/ZKMocks.cc
+--- zkc-3.4.5-orig/c/tests/ZKMocks.cc	2012-09-30 13:53:32.000000000 -0400
++++ zkc-3.4.5/c/tests/ZKMocks.cc	2014-07-29 03:13:59.000000000 -0400
+@@ -41,7 +41,7 @@
+     int offset=sizeof(req->protocolVersion);
+     
+     memcpy(&req->lastZxidSeen,buf.data()+offset,sizeof(req->lastZxidSeen));
+-    req->lastZxidSeen = htonll(req->lastZxidSeen);
++    req->lastZxidSeen = zk_htonll(req->lastZxidSeen);
+     offset+=sizeof(req->lastZxidSeen);
+     
+     memcpy(&req->timeOut,buf.data()+offset,sizeof(req->timeOut));
+@@ -49,7 +49,7 @@
+     offset+=sizeof(req->timeOut);
+     
+     memcpy(&req->sessionId,buf.data()+offset,sizeof(req->sessionId));
+-    req->sessionId = htonll(req->sessionId);
++    req->sessionId = zk_htonll(req->sessionId);
+     offset+=sizeof(req->sessionId);
+     
+     memcpy(&req->passwd_len,buf.data()+offset,sizeof(req->passwd_len));
+@@ -322,7 +322,7 @@
+     buf.append((char*)&tmp,sizeof(tmp));
+     tmp=htonl(timeOut);
+     buf.append((char*)&tmp,sizeof(tmp));
+-    int64_t tmp64=htonll(sessionId);
++    int64_t tmp64=zk_htonll(sessionId);
+     buf.append((char*)&tmp64,sizeof(sessionId));
+     tmp=htonl(passwd_len);
+     buf.append((char*)&tmp,sizeof(tmp));

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,8 +183,6 @@ class JavaBase
   attr_reader :event_queue
 
   def reopen(timeout=10, watcher=nil, opts = {})
-#     watcher ||= @default_watcher
-
     @mutex.synchronize do
       @req_registry.clear_watchers!
 
@@ -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.8'
+  VERSION = '1.5.0'
   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,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zookeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.8
-  prerelease: 
+  version: 1.5.0
 platform: java
 authors:
 - Phillip Pearson
@@ -11,68 +10,60 @@ authors:
 - Brian Wickman
 - Neil Conway
 - Jonathan D. Simms
-autorequire: 
+- Mal McKay
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: slyphon-log4j
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.15
-  type: :runtime
+  name: slyphon-log4j
   prerelease: false
+  type: :runtime
   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
         version: 3.3.5
-  type: :runtime
+  name: slyphon-zookeeper_jar
   prerelease: false
+  type: :runtime
   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
-
+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
@@ -92,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-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
 - ext/zkrb_wrapper.c
@@ -147,28 +142,27 @@ files:
 - zoomonkey/zoomonkey.rb
 homepage: https://github.com/slyphon/zookeeper
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - java
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.7.9
+signing_key:
+specification_version: 4
 summary: Apache ZooKeeper driver for Rubies
 test_files:
 - spec/c_zookeeper_spec.rb

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'
-