zookeeper 1.4.4-java → 1.4.6-java

data/ext/generate_gvl_code.rb

@@ -202,11 +202,9 @@ class GeneratedCode < Struct.new(:structs, :wrapper_fns, :calling_fns)
 
         typed_args = argstr.split(',').map(&:strip)
 
-        # gah, fix up zoo_aset_acl which has a void_completion_t with no name assigned
-        if zoo_fn_name == 'zoo_aset_acl'
-          if idx = typed_args.index('void_completion_t')
-            typed_args[idx] = 'void_completion_t completion'
-          end
+        # gah, fix up functions which have a void_completion_t with no name assigned
+        if idx = typed_args.index('void_completion_t')
+          typed_args[idx] = 'void_completion_t completion'
         end
 
         struct = CallStruct.new(zoo_fn_name, typed_args)
@@ -233,7 +231,7 @@ def render_header_file(code)
 #endif
 
 #include "ruby.h"
-#include "c-client-src/zookeeper.h"
+#include "zookeeper/zookeeper.h"
 #include "zkrb_wrapper_compat.h"
 #include "dbg.h"
 

data/ext/patches/zkc-3.4.5-logging.patch

@@ -0,0 +1,41 @@
+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 10:53:32.000000000 -0700
++++ zkc-3.4.5/c/src/zookeeper.c	2013-09-07 21:25:24.000000000 -0700
+@@ -1650,14 +1650,16 @@
+         // a PING
+         if (zh->state==ZOO_CONNECTED_STATE) {
+             send_to = zh->recv_timeout/3 - idle_send;
+-            if (send_to <= 0 && zh->sent_requests.head==0) {
+-//                LOG_DEBUG(("Sending PING to %s (exceeded idle by %dms)",
+-//                                format_current_endpoint_info(zh),-send_to));
+-                int rc=send_ping(zh);
+-                if (rc < 0){
+-                    LOG_ERROR(("failed to send PING request (zk retcode=%d)",rc));
+-                    return api_epilog(zh,rc);
+-                }
++            if (send_to <= 0) {
++                if (zh->sent_requests.head==0) {
++                    LOG_DEBUG(("Sending PING to %s (exceeded idle by %dms)",
++                                   format_current_endpoint_info(zh),-send_to));
++                    int rc=send_ping(zh);
++                    if (rc < 0){
++                        LOG_ERROR(("failed to send PING request (zk retcode=%d)",rc));
++                        return api_epilog(zh,rc);
++                    }
++                }
+                 send_to = zh->recv_timeout/3;
+             }
+         }
+@@ -1669,6 +1671,12 @@
+             zh->next_deadline.tv_sec += zh->next_deadline.tv_usec / 1000000;
+             zh->next_deadline.tv_usec = zh->next_deadline.tv_usec % 1000000;
+         }
++        
++        if (tv->tv_sec == 0 && tv->tv_usec == 0) {
++          LOG_DEBUG(("Returning a 0.0 timeval: state=%d idle_recv=%d idle_send=%d recv_to=%d send_to=%d  send_requests=%s",
++            zh->state, idle_recv, idle_send, recv_to, send_to, zh->sent_requests.head==0 ? "false" : "true"));
++        }
++        
+         *interest = ZOOKEEPER_READ;
+         /* we are interested in a write if we are connected and have something
+          * to send, or we are waiting for a connect to finish. */

data/ext/zkrb.c

@@ -73,7 +73,7 @@
 #include "ruby/io.h"
 #endif
 
-#include "c-client-src/zookeeper.h"
+#include "zookeeper/zookeeper.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -82,6 +82,7 @@
 #include <pthread.h>
 #include <inttypes.h>
 #include <time.h>
+#include <arpa/inet.h>
 
 #include "common.h"
 #include "event_lib.h"
@@ -242,7 +243,7 @@ static void print_zkrb_instance_data(zkrb_instance_data_t* ptr) {
   fprintf(stderr, "}\n");
 }
 
-#define session_timeout_msec(self) rb_iv_get(self, "@_session_timeout_msec")
+#define receive_timeout_msec(self) rb_iv_get(self, "@_receive_timeout_msec")
 
 inline static void zkrb_debug_clientid_t(const clientid_t *cid) {
   int pass_len = sizeof(cid->passwd);
@@ -268,18 +269,28 @@ static VALUE method_zkrb_init(int argc, VALUE* argv, VALUE self) {
   Check_Type(hostPort, T_STRING);
 
   // Look up :zkc_log_level
-  VALUE log_level = rb_hash_aref(options, ID2SYM(rb_intern("zkc_log_level")));
-  if (NIL_P(log_level)) {
-    zoo_set_debug_level(0); // no log messages
-  } else {
-    Check_Type(log_level, T_FIXNUM);
-    zoo_set_debug_level(FIX2INT(log_level));
-  }
+  // VALUE log_level = rb_hash_aref(options, ID2SYM(rb_intern("zkc_log_level")));
+  // if (NIL_P(log_level)) {
+  //   zoo_set_debug_level(0); // no log messages
+  // } else {
+  //   Check_Type(log_level, T_FIXNUM);
+  //   zoo_set_debug_level(FIX2INT(log_level));
+  // }
 
   volatile VALUE data;
   zkrb_instance_data_t *zk_local_ctx;
   data = Data_Make_Struct(CZookeeper, zkrb_instance_data_t, 0, free_zkrb_instance_data, zk_local_ctx);
 
+  // Look up :session_id and :session_passwd
+  VALUE session_id = rb_hash_aref(options, ID2SYM(rb_intern("session_id")));
+  VALUE password   = rb_hash_aref(options, ID2SYM(rb_intern("session_passwd")));
+  if (!NIL_P(session_id) && !NIL_P(password)) {
+      Check_Type(password, T_STRING);
+
+      zk_local_ctx->myid.client_id = NUM2LL(session_id);
+      strncpy(zk_local_ctx->myid.passwd, RSTRING_PTR(password), 16);
+  }
+
   zk_local_ctx->queue = zkrb_queue_alloc();
 
   if (zk_local_ctx->queue == NULL)
@@ -296,7 +307,7 @@ static VALUE method_zkrb_init(int argc, VALUE* argv, VALUE self) {
       zookeeper_init(
           RSTRING_PTR(hostPort),        // const char *host
           zkrb_state_callback,          // watcher_fn
-          session_timeout_msec(self),   // recv_timeout
+          receive_timeout_msec(self),   // recv_timeout
           &zk_local_ctx->myid,          // cilentid_t
           ctx,                          // void *context
           0);                           // flags
@@ -323,7 +334,7 @@ static VALUE method_get_children(VALUE self, VALUE reqid, VALUE path, VALUE asyn
   struct String_vector strings;
   struct Stat stat;
 
-  int rc;
+  int rc = 0;
   switch (call_type) {
 
 #ifdef THREADED
@@ -368,7 +379,7 @@ static VALUE method_exists(VALUE self, VALUE reqid, VALUE path, VALUE async, VAL
   VALUE output = Qnil;
   struct Stat stat;
 
-  int rc;
+  int rc = 0;
   switch (call_type) {
 
 #ifdef THREADED
@@ -444,7 +455,7 @@ static VALUE method_create(VALUE self, VALUE reqid, VALUE path, VALUE data, VALU
 
   int invalid_call_type=0;
 
-  int rc;
+  int rc = 0;
   switch (call_type) {
 
 #ifdef THREADED
@@ -516,7 +527,7 @@ static VALUE method_get(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE
   char * data = NULL;
   if (IS_SYNC(call_type)) {
     data = malloc(MAX_ZNODE_SIZE); /* ugh */
-    memset(data, 0, sizeof(data));
+    memset(data, 0, MAX_ZNODE_SIZE);
   }
 
   int rc, invalid_call_type=0;
@@ -778,10 +789,10 @@ static VALUE method_zkrb_iterate_event_loop(VALUE self) {
   fd_set rfds, wfds, efds;
   FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&efds);
 
-  int fd=0, interest=0, events=0, rc=0, maxfd=0;
+  int fd = 0, interest = 0, events = 0, rc = 0, maxfd = 0, irc = 0, prc = 0;
   struct timeval tv;
 
-  zookeeper_interest(zk->zh, &fd, &interest, &tv);
+  irc = zookeeper_interest(zk->zh, &fd, &interest, &tv);
 
   if (fd != -1) {
     if (interest & ZOOKEEPER_READ) {
@@ -824,17 +835,24 @@ static VALUE method_zkrb_iterate_event_loop(VALUE self) {
         rb_raise(rb_eRuntimeError, "read from pipe failed: %s", clean_errno());
       }
     }
-
-    rc = zookeeper_process(zk->zh, events);
   }
   else if (rc == 0) {
-    zkrb_debug("timed out waiting for descriptor to be ready");
+    // zkrb_debug("timed out waiting for descriptor to be ready. interest=%d fd=%d pipe_r_fd=%d maxfd=%d irc=%d timeout=%f",
+    //   interest, fd, pipe_r_fd, maxfd, irc, tv.tv_sec + (tv.tv_usec/ 1000.0 / 1000.0));
   }
   else {
-    log_err("select returned: %d", rc);
+    log_err("select returned an error: rc=%d interest=%d fd=%d pipe_r_fd=%d maxfd=%d irc=%d timeout=%f",
+      rc, interest, fd, pipe_r_fd, maxfd, irc, tv.tv_sec + (tv.tv_usec/ 1000.0 / 1000.0));
   }
 
-  return INT2FIX(rc);
+  prc = zookeeper_process(zk->zh, events);
+
+  if (rc == 0) {
+    zkrb_debug("timed out waiting for descriptor to be ready. prc=%d interest=%d fd=%d pipe_r_fd=%d maxfd=%d irc=%d timeout=%f",
+      prc, interest, fd, pipe_r_fd, maxfd, irc, tv.tv_sec + (tv.tv_usec/ 1000.0 / 1000.0));
+  }
+
+  return INT2FIX(prc);
 }
 
 static VALUE method_has_events(VALUE self) {
@@ -918,6 +936,38 @@ static VALUE method_zerror(VALUE self, VALUE errc) {
   return rb_str_new2(zerror(FIX2INT(errc)));
 }
 
+static VALUE method_connected_host(VALUE self) {
+  FETCH_DATA_PTR(self, zk);
+
+  struct sockaddr addr;
+  socklen_t addr_len = sizeof(addr);
+
+  if (zookeeper_get_connected_host(zk->zh, &addr, &addr_len) != NULL) {
+    char buf[255];
+    char addrstr[128];
+    void *inaddr;
+    int port;
+
+#if defined(AF_INET6)
+    if(addr.sa_family==AF_INET6){
+        inaddr = &((struct sockaddr_in6 *) &addr)->sin6_addr;
+        port = ((struct sockaddr_in6 *) &addr)->sin6_port;
+    } else {
+#endif
+      inaddr = &((struct sockaddr_in *) &addr)->sin_addr;
+      port = ((struct sockaddr_in *) &addr)->sin_port;
+#if defined(AF_INET6)
+    }
+#endif
+
+    inet_ntop(addr.sa_family, inaddr, addrstr, sizeof(addrstr)-1);
+    snprintf(buf, sizeof(buf), "%s:%d", addrstr, ntohs(port));
+    return rb_str_new2(buf);
+  }
+
+  return Qnil;
+}
+
 static void zkrb_define_methods(void) {
 #define DEFINE_METHOD(M, ARGS) { \
     rb_define_method(CZookeeper, #M, method_ ## M, ARGS); }
@@ -953,6 +1003,7 @@ static void zkrb_define_methods(void) {
   DEFINE_METHOD(sync, 2);
   DEFINE_METHOD(zkrb_iterate_event_loop, 0);
   DEFINE_METHOD(zkrb_get_next_event_st, 0);
+  DEFINE_METHOD(connected_host, 0);
 
   // methods for the ruby-side event manager
   DEFINE_METHOD(zkrb_get_next_event, 1);
@@ -985,7 +1036,9 @@ static VALUE zkrb_client_id_method_initialize(VALUE self) {
 
 
 void Init_zookeeper_c() {
+  // Don't debug by default
   ZKRBDebugging = 0;
+  zoo_set_debug_level(0);
 
   mZookeeper = rb_define_module("Zookeeper");
   mZookeeperExceptions = rb_define_module_under(mZookeeper, "Exceptions");

data/ext/zkrb_wrapper.c

@@ -381,6 +381,30 @@ int zkrb_call_zoo_aset_acl(zhandle_t *zh, const char *path, int version, struct
 }
 
 
+static VALUE zkrb_gvl_zoo_amulti(void *data) {
+  zkrb_zoo_amulti_args_t *a = (zkrb_zoo_amulti_args_t *)data;
+  a->rc = zoo_amulti(a->zh, a->count, a->ops, a->results, a->completion, a->data);
+  return Qnil;
+}
+
+// wrapper that calls zoo_amulti via zkrb_gvl_zoo_amulti inside rb_thread_blocking_region
+int zkrb_call_zoo_amulti(zhandle_t *zh, int count, const zoo_op_t *ops, zoo_op_result_t *results, void_completion_t completion, const void *data) {
+  zkrb_zoo_amulti_args_t args = {
+    .rc = ZKRB_FAIL,
+    .zh = zh,
+    .count = count,
+    .ops = ops,
+    .results = results,
+    .completion = completion,
+    .data = data
+  };
+
+  zkrb_thread_blocking_region(zkrb_gvl_zoo_amulti, (void *)&args);
+
+  return args.rc;
+}
+
+
 static VALUE zkrb_gvl_zoo_add_auth(void *data) {
   zkrb_zoo_add_auth_args_t *a = (zkrb_zoo_add_auth_args_t *)data;
   a->rc = zoo_add_auth(a->zh, a->scheme, a->cert, a->certLen, a->completion, a->data);
@@ -729,3 +753,23 @@ int zkrb_call_zoo_set_acl(zhandle_t *zh, const char *path, int version, const st
 }
 
 
+static VALUE zkrb_gvl_zoo_multi(void *data) {
+  zkrb_zoo_multi_args_t *a = (zkrb_zoo_multi_args_t *)data;
+  a->rc = zoo_multi(a->zh, a->count, a->ops, a->results);
+  return Qnil;
+}
+
+// wrapper that calls zoo_multi via zkrb_gvl_zoo_multi inside rb_thread_blocking_region
+int zkrb_call_zoo_multi(zhandle_t *zh, int count, const zoo_op_t *ops, zoo_op_result_t *results) {
+  zkrb_zoo_multi_args_t args = {
+    .rc = ZKRB_FAIL,
+    .zh = zh,
+    .count = count,
+    .ops = ops,
+    .results = results
+  };
+
+  zkrb_thread_blocking_region(zkrb_gvl_zoo_multi, (void *)&args);
+
+  return args.rc;
+}

data/ext/zkrb_wrapper.h

@@ -7,7 +7,7 @@
 #endif
 
 #include "ruby.h"
-#include "c-client-src/zookeeper.h"
+#include "zookeeper/zookeeper.h"
 #include "zkrb_wrapper_compat.h"
 #include "dbg.h"
 
@@ -157,6 +157,16 @@ typedef struct {
   int rc;
 } zkrb_zoo_aset_acl_args_t;
 
+typedef struct {
+  zhandle_t *zh;
+  int count;
+  const zoo_op_t *ops;
+  zoo_op_result_t *results;
+  void_completion_t completion;
+  const void *data;
+  int rc;
+} zkrb_zoo_amulti_args_t;
+
 typedef struct {
   zhandle_t *zh;
   const char* scheme;
@@ -295,6 +305,14 @@ typedef struct {
   int rc;
 } zkrb_zoo_set_acl_args_t;
 
+typedef struct {
+  zhandle_t *zh;
+  int count;
+  const zoo_op_t *ops;
+  zoo_op_result_t *results;
+  int rc;
+} zkrb_zoo_multi_args_t;
+
 int zkrb_call_zoo_recv_timeout(zhandle_t *zh);
 int zkrb_call_zoo_state(zhandle_t *zh);
 int zkrb_call_zoo_acreate(zhandle_t *zh, const char *path, const char *value, int valuelen, const struct ACL_vector *acl, int flags, string_completion_t completion, const void *data);
@@ -311,6 +329,7 @@ int zkrb_call_zoo_awget_children2(zhandle_t *zh, const char *path, watcher_fn wa
 int zkrb_call_zoo_async(zhandle_t *zh, const char *path, string_completion_t completion, const void *data);
 int zkrb_call_zoo_aget_acl(zhandle_t *zh, const char *path, acl_completion_t completion, const void *data);
 int zkrb_call_zoo_aset_acl(zhandle_t *zh, const char *path, int version, struct ACL_vector *acl, void_completion_t completion, const void *data);
+int zkrb_call_zoo_amulti(zhandle_t *zh, int count, const zoo_op_t *ops, zoo_op_result_t *results, void_completion_t completion, const void *data);
 int zkrb_call_zoo_add_auth(zhandle_t *zh, const char* scheme, const char* cert, int certLen, void_completion_t completion, const void *data);
 int zkrb_call_zoo_create(zhandle_t *zh, const char *path, const char *value, int valuelen, const struct ACL_vector *acl, int flags, char *path_buffer, int path_buffer_len);
 int zkrb_call_zoo_delete(zhandle_t *zh, const char *path, int version);
@@ -326,5 +345,6 @@ int zkrb_call_zoo_get_children2(zhandle_t *zh, const char *path, int watch, stru
 int zkrb_call_zoo_wget_children2(zhandle_t *zh, const char *path, watcher_fn watcher, void* watcherCtx, struct String_vector *strings, struct Stat *stat);
 int zkrb_call_zoo_get_acl(zhandle_t *zh, const char *path, struct ACL_vector *acl, struct Stat *stat);
 int zkrb_call_zoo_set_acl(zhandle_t *zh, const char *path, int version, const struct ACL_vector *acl);
+int zkrb_call_zoo_multi(zhandle_t *zh, int count, const zoo_op_t *ops, zoo_op_result_t *results);
 
 #endif /* ZKRB_WRAPPER_H */

data/ext/zookeeper_base.rb

@@ -27,7 +27,8 @@ class ZookeeperBase
   ZOO_LOG_LEVEL_DEBUG  = 4
 
   def_delegators :czk, :get_children, :exists, :delete, :get, :set,
-    :set_acl, :get_acl, :client_id, :sync, :add_auth, :wait_until_connected
+    :set_acl, :get_acl, :client_id, :sync, :add_auth, :wait_until_connected,
+    :connected_host
 
   def self.threadsafe_inquisitor(*syms)
     syms.each do |sym|
@@ -40,7 +41,8 @@ class ZookeeperBase
     end
   end
 
-  threadsafe_inquisitor :connected?, :connecting?, :associating?, :running?
+  threadsafe_inquisitor :connected?, :connecting?, :associating?, :running?,
+    :shutting_down?
 
   attr_reader :event_queue
   
@@ -60,14 +62,14 @@ class ZookeeperBase
   end
   private :reopen_after_fork!
 
-  def reopen(timeout = 10, watcher=nil)
+  def reopen(timeout = 10, watcher=nil, opts = {})
     raise "You cannot set the watcher to a different value this way anymore!" if watcher
 
     reopen_after_fork! if forked?
 
     @mutex.synchronize do
       @czk.close if @czk
-      @czk = CZookeeper.new(@host, @event_queue)
+      @czk = CZookeeper.new(@host, @event_queue, opts)
 
       # flushes all outstanding watcher reqs.
       @req_registry.clear_watchers!
@@ -79,7 +81,7 @@ class ZookeeperBase
     state
   end
 
-  def initialize(host, timeout = 10, watcher=nil)
+  def initialize(host, timeout = 10, watcher=nil, opts = {})
     # approximate the java behavior of raising java.lang.IllegalArgumentException if the host
     # argument ends with '/'
     raise ArgumentError, "Host argument #{host.inspect} may not end with /" if host.end_with?('/')
@@ -97,7 +99,7 @@ class ZookeeperBase
     
     yield self if block_given?
 
-    reopen(timeout)
+    reopen(timeout, nil, opts)
   end
 
   # if either of these happen, the user will need to renegotiate a connection via reopen

data/java/java_base.rb

@@ -1,9 +1,9 @@
 require 'java'
 require 'thread'
-require 'rubygems'
 
-gem 'slyphon-log4j', '= 1.2.15'
-gem 'slyphon-zookeeper_jar', '= 3.3.5'
+# require 'rubygems'
+# gem 'slyphon-log4j', '= 1.2.15'
+# gem 'zk-ruby-zookeeper_jar', "= #{Zookeeper::DRIVER_VERSION}"
 
 require 'log4j'
 require 'zookeeper_jar'
@@ -182,13 +182,13 @@ class JavaBase
 
   attr_reader :event_queue
 
-  def reopen(timeout=10, watcher=nil)
+  def reopen(timeout=10, watcher=nil, opts = {})
 #     watcher ||= @default_watcher
 
     @mutex.synchronize do
       @req_registry.clear_watchers!
 
-      replace_jzk!
+      replace_jzk!(opts)
       wait_until_connected
     end
 
@@ -220,7 +220,7 @@ class JavaBase
     # allows connected-state handlers to be registered before 
     yield self if block_given?
 
-    reopen(timeout)
+    reopen(timeout, nil, options)
     return nil unless connected?
     @_running = true
     setup_dispatch_thread!
@@ -283,8 +283,9 @@ class JavaBase
         [Code::Ok, nil, nil]    # the 'nil, nil' isn't strictly necessary here
       else # sync
         stat = JZKD::Stat.new
-        data = String.from_java_bytes(jzk.getData(path, watch_cb, stat))
 
+        value = jzk.getData(path, watch_cb, stat)
+        data = String.from_java_bytes(value) unless value.nil?
         [Code::Ok, data, stat.to_hash]
       end
     end
@@ -487,9 +488,13 @@ class JavaBase
       }
     end
 
-    def replace_jzk!
+    def replace_jzk!(opts = {})
       orig_jzk = @jzk
-      @jzk = JZK::ZooKeeper.new(@host, DEFAULT_SESSION_TIMEOUT, JavaCB::WatcherCallback.new(event_queue, :client => self))
+      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))
+      end
     ensure
       orig_jzk.close if orig_jzk
     end