zookeeper 1.4.10-java → 1.4.11-java

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmUxY2Y2ZGM0MzM4MzA0MTYyYWE0ODVmNzgwNDhmMzgxZGIyYWM5ZA==
+    ZDViMzg5YTZiNzUzM2IwMTJlZDI2YTA4ZWUwODBiNDdkNTIxZDUxNg==
   data.tar.gz: !binary |-
-    NTg0ZjdhODRhMzkxMGFlOWYwNDZmYTcwMmVhYzdjZTg2OTNmYjQ2Mw==
+    MzJjNjQyNTZjZmNkMDgyZTdmOTJjMDhhOWQ2ZjY3ZWVlYWQ1NzgzYg==
 SHA512:
   metadata.gz: !binary |-
-    MTIzMzQwNjUxMTExMTQ4OWZhM2ZlZjNmODRkNDhhMGI5MTkwZWYzZDU5OThi
-    YTQ2ZTA1OTFmNDU1OWNjMTM2ZGI5OTk2OGE1MDk3MWZlNjEyNDEwZGFiZWNl
-    YTdkOTZmZmYwNjAxMThhNjQ3NmE3YmQ3ZWVlMjNkMzg2NWIxYmQ=
+    MzU5YzkzYzk1MDNlMTAyOTZjODc4ZTdkODA3MWNlZTU2MjZlYTRlOTUxZWMz
+    MjFjNjM2NTY0OGY1NjA1YzQ5MzY3NmZkZWQxMzM3MWFmZWFiNjRlNTZlYzFi
+    OTcwMDA1NjA2MzI3M2RmMDE5NDA3MGVkY2IzZjdhZDIwZjBhMGI=
   data.tar.gz: !binary |-
-    MzIwMGViM2Y4ZWYyNzYzOWFmNjNjNTIyZGM1ODJhOWI2Mzk4MGFjYWE0OTg1
-    ZjhjYWVkZWIxMjFlYmIyOWIzMzYwZDFlZTljNzAwM2FhOTkwNWU0MGExYTYw
-    ZmE2OTA3MzRlNjgzYzA2Y2I0MDViZDRjMDMyYzU2ZjIxNDYyMWE=
+    YWIxMGQ0ZWU3NTk5NDE5Y2QyYmRlMTE4NmUzYmZiZThkM2ZmZmM3OWM3ZjQx
+    MTUwMjg0ODgyMWQyNjAzYzk0YmFiNWU0NGIyZGEwZjYyNGEwYTllZjVjMTk3
+    ZWFiMTRkZGVhMzQ5NDViNjNkYTM2YTY2ZjJkYjdmYzE0MjIxODE=

data/CHANGELOG

@@ -1,3 +1,10 @@
+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

data/ext/extconf.rb

@@ -89,7 +89,9 @@ Dir.chdir("#{HERE}/lib") do
     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')

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/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.4.10'
+  VERSION = '1.4.11'
   DRIVER_VERSION = '3.4.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zookeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.10
+  version: 1.4.11
 platform: java
 authors:
 - Phillip Pearson
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slyphon-log4j
@@ -88,6 +88,7 @@ files:
 - ext/generate_gvl_code.rb
 - ext/patches/zkc-3.3.5-network.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
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Apache ZooKeeper driver for Rubies