zookeeper 1.4.11 → 1.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -13
- data/.github/workflows/build.yml +55 -0
- data/CHANGELOG +10 -0
- data/README.markdown +5 -28
- data/Rakefile +5 -5
- data/ext/c_zookeeper.rb +16 -16
- data/ext/extconf.rb +4 -2
- data/ext/patches/zkc-3.4.5-buffer-overflow.patch +11 -0
- data/ext/patches/zkc-3.4.5-fetch-and-add.patch +16 -0
- data/java/java_base.rb +1 -3
- data/lib/zookeeper/version.rb +1 -1
- data/spec/forked_connection_spec.rb +3 -5
- data/spec/shared/connection_examples.rb +5 -1
- data/spec/support/10_spawn_zookeeper.rb +0 -4
- data/zookeeper.gemspec +10 -2
- metadata +22 -24
- data/.travis.yml +0 -39
checksums.yaml
CHANGED
@@ -1,15 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
|
5
|
-
data.tar.gz: !binary |-
|
6
|
-
MzJjNjQyNTZjZmNkMDgyZTdmOTJjMDhhOWQ2ZjY3ZWVlYWQ1NzgzYg==
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: e58fc2fee29446802345b97ed1f8f1756e8b1da73b242a4cd1a589e9d20609e4
|
4
|
+
data.tar.gz: 91cc824a682bce23f2f3032592b275158a5353f361f46a69d07c7f4fd187f44a
|
7
5
|
SHA512:
|
8
|
-
metadata.gz:
|
9
|
-
|
10
|
-
NTA2NWJhOWFlYTJmMGJlMmFhYjljZDg5MGI1YjBhZTMxZjliZTE0NmQ5MGFm
|
11
|
-
NWFlYjU3ODczYWFhMDI2NjRlMGQzNTQxZTFkOWFmYzJkMWM3Mjk=
|
12
|
-
data.tar.gz: !binary |-
|
13
|
-
YWIxMGQ0ZWU3NTk5NDE5Y2QyYmRlMTE4NmUzYmZiZThkM2ZmZmM3OWM3ZjQx
|
14
|
-
MTUwMjg0ODgyMWQyNjAzYzk0YmFiNWU0NGIyZGEwZjYyNGEwYTllZjVjMTk3
|
15
|
-
ZWFiMTRkZGVhMzQ5NDViNjNkYTM2YTY2ZjJkYjdmYzE0MjIxODE=
|
6
|
+
metadata.gz: af87a53d7d849685e464c5355d3517eb6669e9b44adbad6d7b8871353fc48c1aabad0eb5ea20c7fe1d99763f892be41db5a8292451efc1b736821ae47ca62c17
|
7
|
+
data.tar.gz: f1a929816dcf301ff183c88465817be229dac87bc2e1ec3c6f340a4ed8bb95fca64d253cabbfa79ae7367fff428e2d05829b2b4cc0933d178414b76f2a781328
|
@@ -0,0 +1,55 @@
|
|
1
|
+
on:
|
2
|
+
pull_request:
|
3
|
+
branches:
|
4
|
+
- master
|
5
|
+
push:
|
6
|
+
branches:
|
7
|
+
- master
|
8
|
+
|
9
|
+
jobs:
|
10
|
+
build:
|
11
|
+
name: Ruby ${{ matrix.ruby }} / GCC ${{ matrix.gcc }} / ${{ matrix.os }}
|
12
|
+
runs-on: ${{ matrix.os }}
|
13
|
+
strategy:
|
14
|
+
fail-fast: false
|
15
|
+
matrix:
|
16
|
+
os:
|
17
|
+
- ubuntu-latest
|
18
|
+
- macos-latest
|
19
|
+
ruby:
|
20
|
+
- 2.5
|
21
|
+
- 2.6
|
22
|
+
- 2.7
|
23
|
+
- 3.0
|
24
|
+
- jruby
|
25
|
+
gcc:
|
26
|
+
- 7
|
27
|
+
- latest
|
28
|
+
exclude:
|
29
|
+
- os: macos-latest
|
30
|
+
gcc: 7
|
31
|
+
|
32
|
+
steps:
|
33
|
+
- uses: actions/checkout@v2
|
34
|
+
with:
|
35
|
+
submodules: recursive
|
36
|
+
|
37
|
+
- name: Set up GCC
|
38
|
+
if: ${{ matrix.gcc != 'latest' }}
|
39
|
+
uses: egor-tensin/setup-gcc@v1
|
40
|
+
with:
|
41
|
+
version: ${{ matrix.gcc }}
|
42
|
+
platform: x64
|
43
|
+
|
44
|
+
- name: Set up Ruby
|
45
|
+
uses: ruby/setup-ruby@v1
|
46
|
+
with:
|
47
|
+
ruby-version: ${{ matrix.ruby }}
|
48
|
+
bundler-cache: true
|
49
|
+
|
50
|
+
- name: Run Tests
|
51
|
+
env:
|
52
|
+
RAILS_ENV: test
|
53
|
+
SPAWN_ZOOKEEPER: true
|
54
|
+
run: |
|
55
|
+
bundle exec rake
|
data/CHANGELOG
CHANGED
@@ -1,3 +1,13 @@
|
|
1
|
+
v1.5.0
|
2
|
+
* (housekeeping) Moves build to Github Actions from TravisCI
|
3
|
+
* (housekeeping) Drops build support for MRI Ruby < 2.5 and other rubies
|
4
|
+
* Build on Ruby 3 (#99) (h/t: @malmckay)
|
5
|
+
* Build on MacOS (#98) (h/t: @malmckay)
|
6
|
+
* Work around compiler errors on newer versions of gcc (#97) (h/t: @nickmarden)
|
7
|
+
* Fix a typo on a has_key (#83) (h/t: @lexspoon)
|
8
|
+
* Adds support macOS dylib (#86) (h/t: @pftg)
|
9
|
+
* Fix compilation on ARM (#82) (h/t: @cdonati)
|
10
|
+
|
1
11
|
v1.4.11
|
2
12
|
* backported fix for ZOOKEEPER-2253 by @chchen - #76
|
3
13
|
|
data/README.markdown
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# zookeeper #
|
2
2
|
|
3
|
-
|
3
|
+
![Build Status](https://github.com/zk-ruby/zookeeper/actions/workflows/build.yml/badge.svg)
|
4
|
+
|
4
5
|
|
5
6
|
An interface to the Zookeeper cluster coordination server.
|
6
7
|
|
@@ -10,14 +11,10 @@ For a higher-level interface with a more convenient API and features such as loc
|
|
10
11
|
|
11
12
|
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.
|
12
13
|
|
13
|
-
## Big Plans for 1.0 ##
|
14
|
-
|
15
|
-
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.
|
16
|
-
|
17
14
|
## License
|
18
15
|
|
19
|
-
Copyright 2008 Phillip Pearson, and 2010 Twitter, Inc.
|
20
|
-
Licensed under the MIT License. See the included LICENSE file.
|
16
|
+
Copyright 2008 Phillip Pearson, and 2010 Twitter, Inc.
|
17
|
+
Licensed under the MIT License. See the included LICENSE file.
|
21
18
|
|
22
19
|
Portions copyright 2008-2010 the Apache Software Foundation, licensed under the
|
23
20
|
Apache 2 license, and used with permission.
|
@@ -28,26 +25,6 @@ Portions contributed to the open source community by HPDC, L.P.
|
|
28
25
|
|
29
26
|
sudo gem install zookeeper
|
30
27
|
|
31
|
-
### rbenv is awesome
|
32
|
-
|
33
|
-
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.
|
34
|
-
|
35
|
-
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.
|
36
|
-
|
37
|
-
So, it seems that [ruby-build][] doesn't use `--enable-shared` by default. I'm told this is for speed.
|
38
|
-
|
39
|
-
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)
|
40
|
-
|
41
|
-
```shell
|
42
|
-
~ $ CONFIGURE_OPTS='--enable-shared --disable-install-doc' rbenv install 1.9.3-p194
|
43
|
-
```
|
44
|
-
|
45
|
-
[ruby-build]: https://github.com/sstephenson/ruby-build
|
46
|
-
|
47
|
-
### A note for REE users
|
48
|
-
|
49
|
-
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`.
|
50
|
-
|
51
28
|
## Usage
|
52
29
|
|
53
30
|
Connect to a server:
|
@@ -75,7 +52,7 @@ Calls take a dictionary of parameters. With the exception of set\_acl, the only
|
|
75
52
|
|
76
53
|
### A Bit about this repository ###
|
77
54
|
|
78
|
-
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`.
|
55
|
+
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`.
|
79
56
|
|
80
57
|
The plan is to keep the `slyphon-zookeeper` tags, and to tag the `zookeeper` releases `twitter/release/0.4.x`.
|
81
58
|
|
data/Rakefile
CHANGED
@@ -38,7 +38,7 @@ if File.exists?(release_ops_path)
|
|
38
38
|
|
39
39
|
orig_dir = Dir.getwd
|
40
40
|
|
41
|
-
|
41
|
+
Dir.chdir tmpdir do
|
42
42
|
sh "git co #{tag} && git reset --hard && git clean -fdx"
|
43
43
|
|
44
44
|
ENV['JAVA_GEM'] = nil
|
@@ -77,7 +77,7 @@ end
|
|
77
77
|
VALGRIND_BASIC_OPTS = '--num-callers=50 --error-limit=no --partial-loads-ok=yes --undef-value-errors=no --trace-children=yes'
|
78
78
|
|
79
79
|
task 'valgrind' do
|
80
|
-
|
80
|
+
Dir.chdir 'ext' do
|
81
81
|
sh "rake clean build"
|
82
82
|
end
|
83
83
|
|
@@ -86,7 +86,7 @@ end
|
|
86
86
|
|
87
87
|
namespace :build do
|
88
88
|
task :clean do
|
89
|
-
|
89
|
+
Dir.chdir 'ext' do
|
90
90
|
sh 'rake clean'
|
91
91
|
end
|
92
92
|
|
@@ -94,7 +94,7 @@ namespace :build do
|
|
94
94
|
end
|
95
95
|
|
96
96
|
task :clobber do
|
97
|
-
|
97
|
+
Dir.chdir 'ext' do
|
98
98
|
sh 'rake clobber'
|
99
99
|
end
|
100
100
|
|
@@ -104,7 +104,7 @@ end
|
|
104
104
|
|
105
105
|
desc "Build C component"
|
106
106
|
task :build do
|
107
|
-
|
107
|
+
Dir.chdir 'ext' do
|
108
108
|
sh "rake"
|
109
109
|
end
|
110
110
|
end
|
data/ext/c_zookeeper.rb
CHANGED
@@ -48,7 +48,7 @@ class CZookeeper
|
|
48
48
|
|
49
49
|
# keep track of the pid that created us
|
50
50
|
update_pid!
|
51
|
-
|
51
|
+
|
52
52
|
# used by the C layer. CZookeeper sets this to true when the init method
|
53
53
|
# has completed. once this is set to true, it stays true.
|
54
54
|
#
|
@@ -68,7 +68,7 @@ class CZookeeper
|
|
68
68
|
@_receive_timeout_msec = opts[:receive_timeout_msec] || DEFAULT_RECEIVE_TIMEOUT_MSEC
|
69
69
|
|
70
70
|
@mutex = Monitor.new
|
71
|
-
|
71
|
+
|
72
72
|
# used to signal that we're running
|
73
73
|
@running_cond = @mutex.new_cond
|
74
74
|
|
@@ -80,7 +80,7 @@ class CZookeeper
|
|
80
80
|
@state = ZOO_CLOSED_STATE
|
81
81
|
|
82
82
|
@pipe_read, @pipe_write = IO.pipe
|
83
|
-
|
83
|
+
|
84
84
|
@event_thread = nil
|
85
85
|
|
86
86
|
# hash of in-flight Continuation instances
|
@@ -142,7 +142,7 @@ class CZookeeper
|
|
142
142
|
|
143
143
|
nil
|
144
144
|
end
|
145
|
-
|
145
|
+
|
146
146
|
# call this to stop the event loop, you can resume with the
|
147
147
|
# resume method
|
148
148
|
#
|
@@ -157,7 +157,7 @@ class CZookeeper
|
|
157
157
|
def resume_after_fork_in_parent
|
158
158
|
logger.debug { "##{__method__}" }
|
159
159
|
|
160
|
-
@mutex.synchronize do
|
160
|
+
@mutex.synchronize do
|
161
161
|
@_shutting_down = nil
|
162
162
|
start_event_thread
|
163
163
|
end
|
@@ -181,7 +181,7 @@ class CZookeeper
|
|
181
181
|
return false unless wait_until_running(timeout)
|
182
182
|
|
183
183
|
@state_mutex.synchronize do
|
184
|
-
while true
|
184
|
+
while true
|
185
185
|
if timeout
|
186
186
|
now = Time.now
|
187
187
|
break if (@state == ZOO_CONNECTED_STATE) || unhealthy? || (now > time_to_stop)
|
@@ -212,7 +212,7 @@ class CZookeeper
|
|
212
212
|
!unhealthy?
|
213
213
|
end
|
214
214
|
|
215
|
-
# submits a job for processing
|
215
|
+
# submits a job for processing
|
216
216
|
# blocks the caller until result has returned
|
217
217
|
def submit_and_block(meth, *args)
|
218
218
|
@mutex.synchronize do
|
@@ -230,9 +230,9 @@ class CZookeeper
|
|
230
230
|
wake_event_loop!
|
231
231
|
cnt.value
|
232
232
|
end
|
233
|
-
|
233
|
+
|
234
234
|
# this method is part of the reopen/close code, and is responsible for
|
235
|
-
# shutting down the dispatch thread.
|
235
|
+
# shutting down the dispatch thread.
|
236
236
|
#
|
237
237
|
# this method must be EXTERNALLY SYNCHRONIZED!
|
238
238
|
#
|
@@ -243,7 +243,7 @@ class CZookeeper
|
|
243
243
|
logger.debug { "##{__method__}" }
|
244
244
|
shut_down!
|
245
245
|
wake_event_loop!
|
246
|
-
@event_thread.join
|
246
|
+
@event_thread.join
|
247
247
|
@event_thread = nil
|
248
248
|
end
|
249
249
|
end
|
@@ -259,7 +259,7 @@ class CZookeeper
|
|
259
259
|
# or until timeout seconds have passed.
|
260
260
|
#
|
261
261
|
# returns true if we're running, false if we timed out
|
262
|
-
def wait_until_running(timeout=5)
|
262
|
+
def wait_until_running(timeout=5)
|
263
263
|
@mutex.synchronize do
|
264
264
|
return true if @_running
|
265
265
|
@running_cond.wait(timeout)
|
@@ -279,7 +279,7 @@ class CZookeeper
|
|
279
279
|
submit_pending_calls
|
280
280
|
end
|
281
281
|
|
282
|
-
zkrb_iterate_event_loop
|
282
|
+
zkrb_iterate_event_loop
|
283
283
|
iterate_event_delivery
|
284
284
|
end
|
285
285
|
|
@@ -328,7 +328,7 @@ class CZookeeper
|
|
328
328
|
end
|
329
329
|
|
330
330
|
def wake_event_loop!
|
331
|
-
@pipe_write && @pipe_write.write('1')
|
331
|
+
@pipe_write && !@pipe_write.closed? && @pipe_write.write('1')
|
332
332
|
end
|
333
333
|
|
334
334
|
def iterate_event_delivery
|
@@ -345,10 +345,10 @@ class CZookeeper
|
|
345
345
|
end
|
346
346
|
end
|
347
347
|
end
|
348
|
-
|
348
|
+
|
349
349
|
cntn = @reg.in_flight.delete(hash[:req_id])
|
350
350
|
|
351
|
-
if cntn and not cntn.user_callback? # this is one of "our" continuations
|
351
|
+
if cntn and not cntn.user_callback? # this is one of "our" continuations
|
352
352
|
cntn.call(hash) # so we handle delivering it
|
353
353
|
next # and skip handing it to the dispatcher
|
354
354
|
end
|
@@ -374,7 +374,7 @@ class CZookeeper
|
|
374
374
|
def shut_down!
|
375
375
|
logger.debug { "##{__method__}" }
|
376
376
|
|
377
|
-
@mutex.synchronize do
|
377
|
+
@mutex.synchronize do
|
378
378
|
@_shutting_down = true
|
379
379
|
# ollie ollie oxen all home free!
|
380
380
|
@running_cond.broadcast
|
data/ext/extconf.rb
CHANGED
@@ -84,8 +84,10 @@ end
|
|
84
84
|
# Absolutely prevent the linker from picking up any other zookeeper_mt
|
85
85
|
Dir.chdir("#{HERE}/lib") do
|
86
86
|
%w[st mt].each do |stmt|
|
87
|
-
%w[a la].each do |ext|
|
88
|
-
|
87
|
+
%w[a la dylib].each do |ext|
|
88
|
+
origin_lib_name = "libzookeeper_#{stmt}.#{ext}"
|
89
|
+
dest_lib_name = "libzookeeper_#{stmt}_gem.#{ext}"
|
90
|
+
system("cp -f #{origin_lib_name} #{dest_lib_name}") if File.exists?(origin_lib_name)
|
89
91
|
end
|
90
92
|
end
|
91
93
|
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
--- zkc-3.4.5.orig/c/src/zookeeper.c 2020-08-13 03:04:49.631654715 -0400
|
2
|
+
+++ zkc-3.4.5/c/src/zookeeper.c 2020-08-13 03:03:24.983922697 -0400
|
3
|
+
@@ -3411,7 +3411,7 @@
|
4
|
+
|
5
|
+
static const char* format_endpoint_info(const struct sockaddr_storage* ep)
|
6
|
+
{
|
7
|
+
- static char buf[128];
|
8
|
+
+ static char buf[128+6];
|
9
|
+
char addrstr[128];
|
10
|
+
void *inaddr;
|
11
|
+
#ifdef WIN32
|
@@ -0,0 +1,16 @@
|
|
1
|
+
diff -ur zkc-3.4.5-orig/c/src/mt_adaptor.c zkc-3.4.5/c/src/mt_adaptor.c
|
2
|
+
--- zkc-3.4.5-orig/c/src/mt_adaptor.c 2012-09-30 10:53:32.000000000 -0700
|
3
|
+
+++ zkc-3.4.5/c/src/mt_adaptor.c 2016-09-07 16:55:13.787553837 -0700
|
4
|
+
@@ -484,11 +484,7 @@
|
5
|
+
{
|
6
|
+
#ifndef WIN32
|
7
|
+
int32_t result;
|
8
|
+
- asm __volatile__(
|
9
|
+
- "lock xaddl %0,%1\n"
|
10
|
+
- : "=r"(result), "=m"(*(int *)operand)
|
11
|
+
- : "0"(incr)
|
12
|
+
- : "memory");
|
13
|
+
+ result = __sync_fetch_and_add(operand, incr);
|
14
|
+
return result;
|
15
|
+
#else
|
16
|
+
volatile int32_t result;
|
data/java/java_base.rb
CHANGED
@@ -183,8 +183,6 @@ class JavaBase
|
|
183
183
|
attr_reader :event_queue
|
184
184
|
|
185
185
|
def reopen(timeout=10, watcher=nil, opts = {})
|
186
|
-
# watcher ||= @default_watcher
|
187
|
-
|
188
186
|
@mutex.synchronize do
|
189
187
|
@req_registry.clear_watchers!
|
190
188
|
|
@@ -490,7 +488,7 @@ class JavaBase
|
|
490
488
|
|
491
489
|
def replace_jzk!(opts = {})
|
492
490
|
orig_jzk = @jzk
|
493
|
-
if opts.has_key?(:session_id) && opts.has_key(:session_passwd)
|
491
|
+
if opts.has_key?(:session_id) && opts.has_key?(:session_passwd)
|
494
492
|
@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)
|
495
493
|
else
|
496
494
|
@jzk = JZK::ZooKeeper.new(@host, DEFAULT_SESSION_TIMEOUT, JavaCB::WatcherCallback.new(event_queue, :client => self))
|
data/lib/zookeeper/version.rb
CHANGED
@@ -4,7 +4,7 @@ unless defined?(::JRUBY_VERSION)
|
|
4
4
|
describe %[forked connection] do
|
5
5
|
let(:path) { "/_zktest_" }
|
6
6
|
let(:pids_root) { "#{path}/pids" }
|
7
|
-
let(:data) { "underpants" }
|
7
|
+
let(:data) { "underpants" }
|
8
8
|
let(:connection_string) { Zookeeper.default_cnx_str }
|
9
9
|
|
10
10
|
def process_alive?(pid)
|
@@ -15,7 +15,7 @@ unless defined?(::JRUBY_VERSION)
|
|
15
15
|
end
|
16
16
|
|
17
17
|
LBORDER = ('-' * 35) << '< '
|
18
|
-
RBORDER = ' >' << ('-' * 35)
|
18
|
+
RBORDER = ' >' << ('-' * 35)
|
19
19
|
|
20
20
|
def mark(thing)
|
21
21
|
logger << "\n#{LBORDER}#{thing}#{RBORDER}\n\n"
|
@@ -25,8 +25,6 @@ unless defined?(::JRUBY_VERSION)
|
|
25
25
|
mark "BEFORE: START"
|
26
26
|
if defined?(::Rubinius)
|
27
27
|
pending("this test is currently broken in rbx")
|
28
|
-
# elsif ENV['TRAVIS']
|
29
|
-
# pending("this test is currently hanging in travis")
|
30
28
|
else
|
31
29
|
@zk = Zookeeper.new(connection_string)
|
32
30
|
rm_rf(@zk, path)
|
@@ -105,7 +103,7 @@ unless defined?(::JRUBY_VERSION)
|
|
105
103
|
@zk.resume_after_fork_in_parent
|
106
104
|
|
107
105
|
event_waiter_th = Thread.new do
|
108
|
-
@latch.await(5) unless @event
|
106
|
+
@latch.await(5) unless @event
|
109
107
|
@event
|
110
108
|
end
|
111
109
|
|
@@ -1051,7 +1051,11 @@ shared_examples_for "connection" do
|
|
1051
1051
|
zk.close
|
1052
1052
|
end
|
1053
1053
|
|
1054
|
-
|
1054
|
+
begin
|
1055
|
+
zk.stat(:path => path, :callback => evil_cb)
|
1056
|
+
rescue IOError
|
1057
|
+
# captures flaky IOError: stream closed in another thread
|
1058
|
+
end
|
1055
1059
|
|
1056
1060
|
wait_until { zk.closed? }
|
1057
1061
|
zk.should be_closed
|
data/zookeeper.gemspec
CHANGED
@@ -6,13 +6,21 @@ Gem::Specification.new do |s|
|
|
6
6
|
s.name = 'zookeeper'
|
7
7
|
s.version = Zookeeper::VERSION
|
8
8
|
|
9
|
-
s.authors = [
|
9
|
+
s.authors = [
|
10
|
+
"Phillip Pearson",
|
11
|
+
"Eric Maland",
|
12
|
+
"Evan Weaver",
|
13
|
+
"Brian Wickman",
|
14
|
+
"Neil Conway",
|
15
|
+
"Jonathan D. Simms",
|
16
|
+
"Mal McKay",
|
17
|
+
]
|
10
18
|
s.email = ["slyphon@gmail.com"]
|
11
19
|
s.summary = %q{Apache ZooKeeper driver for Rubies}
|
12
20
|
s.description = <<-EOS
|
13
21
|
A low-level multi-Ruby wrapper around the ZooKeeper API bindings. For a
|
14
22
|
friendlier interface, see http://github.com/slyphon/zk. Currently supported:
|
15
|
-
MRI: {
|
23
|
+
MRI: {2.5, 2.6, 2.7, 3.0}, JRuby: ~> 9.2.x.x
|
16
24
|
|
17
25
|
This library uses version #{Zookeeper::DRIVER_VERSION} of zookeeper bindings.
|
18
26
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: zookeeper
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.5.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Phillip Pearson
|
@@ -10,23 +10,19 @@ authors:
|
|
10
10
|
- Brian Wickman
|
11
11
|
- Neil Conway
|
12
12
|
- Jonathan D. Simms
|
13
|
-
|
13
|
+
- Mal McKay
|
14
|
+
autorequire:
|
14
15
|
bindir: bin
|
15
16
|
cert_chain: []
|
16
|
-
date:
|
17
|
+
date: 2021-09-27 00:00:00.000000000 Z
|
17
18
|
dependencies: []
|
18
|
-
description:
|
19
|
-
For a
|
20
|
-
|
19
|
+
description: |+
|
20
|
+
A low-level multi-Ruby wrapper around the ZooKeeper API bindings. For a
|
21
21
|
friendlier interface, see http://github.com/slyphon/zk. Currently supported:
|
22
|
-
|
23
|
-
MRI: {1.8.7, 1.9.2, 1.9.3}, JRuby: ~> 1.6.7, Rubinius: 2.0.testing, REE 1.8.7.
|
24
|
-
|
22
|
+
MRI: {2.5, 2.6, 2.7, 3.0}, JRuby: ~> 9.2.x.x
|
25
23
|
|
26
24
|
This library uses version 3.4.5 of zookeeper bindings.
|
27
25
|
|
28
|
-
|
29
|
-
'
|
30
26
|
email:
|
31
27
|
- slyphon@gmail.com
|
32
28
|
executables: []
|
@@ -34,13 +30,13 @@ extensions:
|
|
34
30
|
- ext/extconf.rb
|
35
31
|
extra_rdoc_files: []
|
36
32
|
files:
|
37
|
-
- .ctags_paths
|
38
|
-
- .dotfiles/ruby-gemset
|
39
|
-
- .dotfiles/ruby-version
|
40
|
-
- .dotfiles/rvmrc
|
41
|
-
- .
|
42
|
-
- .
|
43
|
-
- .
|
33
|
+
- ".ctags_paths"
|
34
|
+
- ".dotfiles/ruby-gemset"
|
35
|
+
- ".dotfiles/ruby-version"
|
36
|
+
- ".dotfiles/rvmrc"
|
37
|
+
- ".github/workflows/build.yml"
|
38
|
+
- ".gitignore"
|
39
|
+
- ".gitmodules"
|
44
40
|
- CHANGELOG
|
45
41
|
- Gemfile
|
46
42
|
- Guardfile
|
@@ -60,6 +56,8 @@ files:
|
|
60
56
|
- ext/extconf.rb
|
61
57
|
- ext/generate_gvl_code.rb
|
62
58
|
- ext/patches/zkc-3.3.5-network.patch
|
59
|
+
- ext/patches/zkc-3.4.5-buffer-overflow.patch
|
60
|
+
- ext/patches/zkc-3.4.5-fetch-and-add.patch
|
63
61
|
- ext/patches/zkc-3.4.5-logging.patch
|
64
62
|
- ext/patches/zkc-3.4.5-out-of-order-ping.patch
|
65
63
|
- ext/patches/zkc-3.4.5-yosemite-htonl-fix.patch
|
@@ -118,25 +116,24 @@ files:
|
|
118
116
|
homepage: https://github.com/slyphon/zookeeper
|
119
117
|
licenses: []
|
120
118
|
metadata: {}
|
121
|
-
post_install_message:
|
119
|
+
post_install_message:
|
122
120
|
rdoc_options: []
|
123
121
|
require_paths:
|
124
122
|
- lib
|
125
123
|
- ext
|
126
124
|
required_ruby_version: !ruby/object:Gem::Requirement
|
127
125
|
requirements:
|
128
|
-
- -
|
126
|
+
- - ">="
|
129
127
|
- !ruby/object:Gem::Version
|
130
128
|
version: '0'
|
131
129
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
132
130
|
requirements:
|
133
|
-
- -
|
131
|
+
- - ">="
|
134
132
|
- !ruby/object:Gem::Version
|
135
133
|
version: '0'
|
136
134
|
requirements: []
|
137
|
-
|
138
|
-
|
139
|
-
signing_key:
|
135
|
+
rubygems_version: 3.1.6
|
136
|
+
signing_key:
|
140
137
|
specification_version: 4
|
141
138
|
summary: Apache ZooKeeper driver for Rubies
|
142
139
|
test_files:
|
@@ -157,3 +154,4 @@ test_files:
|
|
157
154
|
- spec/support/progress_formatter.rb
|
158
155
|
- spec/support/zookeeper_spec_helpers.rb
|
159
156
|
- spec/zookeeper_spec.rb
|
157
|
+
...
|
data/.travis.yml
DELETED
@@ -1,39 +0,0 @@
|
|
1
|
-
---
|
2
|
-
notifications:
|
3
|
-
email:
|
4
|
-
- slyphon@gmail.com
|
5
|
-
- eric@5stops.com
|
6
|
-
|
7
|
-
# pull in releaseops submodule
|
8
|
-
before_install:
|
9
|
-
- git submodule update --init --recursive
|
10
|
-
|
11
|
-
env:
|
12
|
-
- SPAWN_ZOOKEEPER='true'
|
13
|
-
|
14
|
-
language: ruby
|
15
|
-
|
16
|
-
rvm:
|
17
|
-
- 1.9.3
|
18
|
-
- 1.9.2
|
19
|
-
- 1.8.7
|
20
|
-
- ree
|
21
|
-
- jruby-18mode
|
22
|
-
- jruby-19mode
|
23
|
-
- rbx-18mode
|
24
|
-
- rbx-19mode
|
25
|
-
- 2.0.0
|
26
|
-
- 2.1.0
|
27
|
-
- 2.2.0
|
28
|
-
matrix:
|
29
|
-
allow_failures:
|
30
|
-
- rvm: rbx-18mode
|
31
|
-
- rvm: rbx-19mode
|
32
|
-
|
33
|
-
bundler_args: --without development docs coverage
|
34
|
-
|
35
|
-
# blacklist
|
36
|
-
branches:
|
37
|
-
except:
|
38
|
-
# - 'dev/zookeeper-st'
|
39
|
-
|