zookeeper-ng 1.5 → 1.5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3ab715117fac5110ed30a26d5b1d4a0f26e1651004ad41c21f38b9d46128d40
-  data.tar.gz: 5cd912c227b7f5fcb764b3ebffe5af6f86aff62adcc56557006abce6133377b6
+  metadata.gz: 6473be848423f7878fa40c93e2cc543fbdcb148ba4db39698e11d65ec4604375
+  data.tar.gz: c06ed9f06b9c07001ba2896a84fdbccbc786e9494306ac1dd8f2ccb0237183d5
 SHA512:
-  metadata.gz: cba2378c1ca772f6552e13b4aa02100a8addd8bba04783be4a75784dbfdbe17c43e5401fb30456f0244642ffa6d0b2e62e6ccc0d0f06e5f2b5736978df902b8a
-  data.tar.gz: 370d3c712634c8f102c647bc968e778ab5b40aba68c44f0e38358e298039340dca86ef51e884ae1188f9dd5e0aae97a611420bd9c26e1da57c3f079a75601606
+  metadata.gz: 3cc469179ea18351407272fc327c0177191bc9f9b598ffebb09b57234e5b918393fa5a3288e7b0427b4ea59d584f7b8cdb77543308fb5ab1bc2c20c8e50b6adf
+  data.tar.gz: bfdada1f2447cadfb6ee6074705ce82b9082ff9f44fbe58a03b7a762bc19c353663c504c2e9c15d5ea0a4b2ded427dc3fe555b9973c8a2837aca2c52f7c136a4

data/.github/workflows/build.yml

@@ -0,0 +1,57 @@
+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'
+          - '3.1'
+          - '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
+          cache-version: 1_${{ matrix.ruby }}_${{ matrix.os }}
+
+      - name: Run Tests
+        env:
+          RAILS_ENV: test
+          SPAWN_ZOOKEEPER: true
+        run: |
+          bundle exec rake

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "releaseops"]
 	path = releaseops
-	url = git://github.com/slyphon/releaseops.git
+	url = https://github.com/zk-ruby/releaseops.git

data/CHANGELOG

@@ -1,5 +1,18 @@
-v1.5
-  * going forward, publishing this fork under zookeeper-ng
+v1.5.2
+  * Ruby 3.1 compatibility (h/t: @casperisfine)
+
+v1.5.1
+  * Update config.guess to support newer environments (h/t: @malmckay)
+
+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

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/patches/{zkc-3.4.5-overflow.patch → zkc-3.4.5-buffer-overflow.patch}

@@ -1,11 +1,11 @@
---- zkc-3.4.5-orig/c/src/zookeeper.c	2020-12-01 14:16:08.000000000 +0100
-+++ zkc-3.4.5/c/src/zookeeper.c	2020-12-01 14:16:08.000000000 +0100
+--- 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[134] = { 0 };
++    static char buf[128+6];
      char addrstr[128];
      void *inaddr;
  #ifdef WIN32