zookeeper 0.4.3 → 0.4.4

data/CHANGELOG

@@ -1,5 +1,6 @@
-v0.4.3 Fix a handful of memory-related bugs, fix SIGSEGV on master change,
-       reduce latency of event handling, fix compilation on OSX.
+v0.4.4 Fix race condition on close, possible data corruption on async get.
+
+v0.4.3 Fix a handful of memory-related bugs, fix SIGSEGV on master change, reduce latency of event handling, fix compilation on OSX.
 
 v0.4.2 Add options to Zookeeper#initialize, silence most Zookeeper logs.
 

data/Rakefile

@@ -2,10 +2,8 @@ require 'echoe'
 
 Echoe.new("zookeeper") do |p|
   p.author = "Phillip Pearson, Eric Maland, Evan Weaver, Brian Wickman"
-  p.project = "fauna"
+  p.project = "twitter"
   p.summary = "An interface to the Zookeeper distributed configuration server."
-  p.url = "https://github.com/twitter/zookeeper"
-  p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
   p.clean_pattern += ["ext/lib", "ext/include", "ext/c", "ext/bin", "ext/conftest.dSYM"]
   p.rdoc_pattern = /README|TODO|LICENSE|CHANGELOG|BENCH|COMPAT|zookeeper_c.c|zookeeper.rb/
-end
+end

data/ext/zookeeper_c.c

@@ -26,6 +26,7 @@ struct zkrb_instance_data {
   zhandle_t            *zh;
   clientid_t          myid;
   zkrb_queue_t      *queue;
+  int        pending_close;
 };
 
 typedef enum {
@@ -99,13 +100,14 @@ static VALUE method_init(int argc, VALUE* argv, VALUE self) {
            free_zkrb_instance_data,
            zk_local_ctx);
   zk_local_ctx->queue = zkrb_queue_alloc();
+  zk_local_ctx->pending_close = 0;
 
   zoo_deterministic_conn_order(0);
 
   zkrb_calling_context *ctx =
     zkrb_calling_context_alloc(ZKRB_GLOBAL_REQ, zk_local_ctx->queue);
 
-  zk_local_ctx->zh = 
+  zk_local_ctx->zh =
       zookeeper_init(
           RSTRING_PTR(hostPort),
           zkrb_state_callback,
@@ -113,7 +115,7 @@ static VALUE method_init(int argc, VALUE* argv, VALUE self) {
           &zk_local_ctx->myid,
           ctx,
           0);
-  
+
 #warning [wickman] TODO handle this properly on the Ruby side rather than C side
   if (!zk_local_ctx->zh) {
     rb_raise(rb_eRuntimeError, "error connecting to zookeeper: %d", errno);
@@ -156,10 +158,10 @@ static VALUE method_init(int argc, VALUE* argv, VALUE self) {
 
 static VALUE method_get_children(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE watch) {
   STANDARD_PREAMBLE(self, zk, reqid, path, async, watch, data_ctx, watch_ctx, call_type);
-  
+
   struct String_vector strings;
   struct Stat stat;
-  
+
   int rc;
   switch (call_type) {
     case SYNC:
@@ -169,11 +171,11 @@ static VALUE method_get_children(VALUE self, VALUE reqid, VALUE path, VALUE asyn
     case SYNC_WATCH:
       rc = zoo_wget_children2(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, &strings, &stat);
       break;
-      
+
     case ASYNC:
       rc = zoo_aget_children2(zk->zh, RSTRING_PTR(path), 0, zkrb_strings_stat_callback, data_ctx);
       break;
-      
+
     case ASYNC_WATCH:
       rc = zoo_awget_children2(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_strings_stat_callback, data_ctx);
       break;
@@ -190,7 +192,7 @@ static VALUE method_get_children(VALUE self, VALUE reqid, VALUE path, VALUE asyn
 
 static VALUE method_exists(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE watch) {
   STANDARD_PREAMBLE(self, zk, reqid, path, async, watch, data_ctx, watch_ctx, call_type);
-  
+
   struct Stat stat;
 
   int rc;
@@ -202,11 +204,11 @@ static VALUE method_exists(VALUE self, VALUE reqid, VALUE path, VALUE async, VAL
     case SYNC_WATCH:
       rc = zoo_wexists(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, &stat);
       break;
-      
+
     case ASYNC:
       rc = zoo_aexists(zk->zh, RSTRING_PTR(path), 0, zkrb_stat_callback, data_ctx);
       break;
-      
+
     case ASYNC_WATCH:
       rc = zoo_awexists(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_stat_callback, data_ctx);
       break;
@@ -223,12 +225,12 @@ static VALUE method_exists(VALUE self, VALUE reqid, VALUE path, VALUE async, VAL
 static VALUE method_create(VALUE self, VALUE reqid, VALUE path, VALUE data, VALUE async, VALUE acls, VALUE flags) {
   VALUE watch = Qfalse;
   STANDARD_PREAMBLE(self, zk, reqid, path, async, watch, data_ctx, watch_ctx, call_type);
-  
+
   if (data != Qnil) Check_Type(data, T_STRING);
   Check_Type(flags, T_FIXNUM);
   const char *data_ptr = (data == Qnil) ? NULL : RSTRING_PTR(data);
   size_t      data_len = (data == Qnil) ? -1   : RSTRING_LEN(data);
-  
+
   struct ACL_vector *aclptr = NULL;
   if (acls != Qnil) { aclptr = zkrb_ruby_to_aclvector(acls); }
   char realpath[16384];
@@ -261,10 +263,10 @@ static VALUE method_create(VALUE self, VALUE reqid, VALUE path, VALUE data, VALU
 }
 
 static VALUE method_delete(VALUE self, VALUE reqid, VALUE path, VALUE version, VALUE async) {
-  VALUE watch = Qfalse; 
+  VALUE watch = Qfalse;
   STANDARD_PREAMBLE(self, zk, reqid, path, async, watch, data_ctx, watch_ctx, call_type);
   Check_Type(version, T_FIXNUM);
-  
+
   int rc = 0;
   switch (call_type) {
     case SYNC:
@@ -293,7 +295,7 @@ static VALUE method_get(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE
   struct Stat stat;
 
   int rc;
-  
+
   switch (call_type) {
     case SYNC:
       rc = zoo_get(zk->zh, RSTRING_PTR(path), 0, data, &data_len, &stat);
@@ -302,11 +304,11 @@ static VALUE method_get(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE
     case SYNC_WATCH:
       rc = zoo_wget(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, data, &data_len, &stat);
       break;
-      
+
     case ASYNC:
       rc = zoo_aget(zk->zh, RSTRING_PTR(path), 0, zkrb_data_callback, data_ctx);
       break;
-      
+
     case ASYNC_WATCH:
       rc = zoo_awget(zk->zh, RSTRING_PTR(path), zkrb_state_callback, watch_ctx, zkrb_data_callback, data_ctx);
       break;
@@ -329,7 +331,7 @@ static VALUE method_get(VALUE self, VALUE reqid, VALUE path, VALUE async, VALUE
 static VALUE method_set(VALUE self, VALUE reqid, VALUE path, VALUE data, VALUE async, VALUE version) {
   VALUE watch = Qfalse;
   STANDARD_PREAMBLE(self, zk, reqid, path, async, watch, data_ctx, watch_ctx, call_type);
-  
+
   struct Stat stat;
   if (data != Qnil) Check_Type(data, T_STRING);
   const char *data_ptr = (data == Qnil) ? NULL : RSTRING_PTR(data);
@@ -389,7 +391,7 @@ static VALUE method_get_acl(VALUE self, VALUE reqid, VALUE path, VALUE async) {
 
   struct ACL_vector acls;
   struct Stat stat;
-  
+
   int rc;
   switch (call_type) {
     case SYNC:
@@ -421,12 +423,7 @@ static VALUE method_get_next_event(VALUE self) {
   for (;;) {
     zkrb_event_t *event = zkrb_dequeue(zk->queue, 1);
 
-    /*
-     * If no events found, wait for an event by using rb_thread_select() on the
-     * queue's pipe. Note that the ZK handle might be closed while we're
-     * waiting; if this happens, the rb_thread_select() will fail, and we can't
-     * safely touch the "zk" instance handle.
-     */
+    /* Wait for an event using rb_thread_select() on the queue's pipe */
     if (event == NULL) {
       int fd = zk->queue->pipe_read;
       fd_set rset;
@@ -440,6 +437,9 @@ static VALUE method_get_next_event(VALUE self) {
       if (read(fd, buf, sizeof(buf)) == -1)
         rb_raise(rb_eRuntimeError, "read failed: %d", errno);
 
+      if (zk->pending_close)
+        return Qnil;
+
       continue;
     }
 
@@ -463,6 +463,15 @@ static VALUE method_client_id(VALUE self) {
   return UINT2NUM(id->client_id);
 }
 
+static VALUE method_signal_pending_close(VALUE self) {
+  FETCH_DATA_PTR(self, zk);
+
+  zk->pending_close = 1;
+  zkrb_signal(zk->queue);
+
+  return Qnil;
+}
+
 static VALUE method_close(VALUE self) {
   FETCH_DATA_PTR(self, zk);
 
@@ -517,8 +526,9 @@ static void zkrb_define_methods(void) {
   DEFINE_METHOD(get, 4);
   DEFINE_METHOD(set, 5);
   DEFINE_METHOD(set_acl, 5);
-  DEFINE_METHOD(get_acl, 3);  
+  DEFINE_METHOD(get_acl, 3);
   DEFINE_METHOD(client_id, 0);
+  DEFINE_METHOD(signal_pending_close, 0);
   DEFINE_METHOD(close, 0);
   DEFINE_METHOD(deterministic_conn_order, 1);
   DEFINE_METHOD(is_unrecoverable, 0);
@@ -528,11 +538,11 @@ static void zkrb_define_methods(void) {
   // DEFINE_METHOD(add_auth, 3);
   // DEFINE_METHOD(async, 1);
 
-  // methods for the ruby-side event manager  
+  // methods for the ruby-side event manager
   DEFINE_METHOD(get_next_event, 0);
   DEFINE_METHOD(has_events, 0);
 
-  // Make these class methods?  
+  // Make these class methods?
   DEFINE_METHOD(set_debug_level, 1);
   DEFINE_METHOD(zerror, 1);
 }

data/ext/zookeeper_lib.c

@@ -69,6 +69,14 @@ zkrb_event_t* zkrb_dequeue(zkrb_queue_t *q, int need_lock) {
   }
 }
 
+void zkrb_signal(zkrb_queue_t *q) {
+  pthread_mutex_lock(&zkrb_q_mutex);
+  ssize_t ret = write(q->pipe_write, "0", 1);   /* Wake up Ruby listener */
+  pthread_mutex_unlock(&zkrb_q_mutex);
+  if (ret == -1)
+    rb_raise(rb_eRuntimeError, "write to pipe failed: %d", errno);
+}
+
 zkrb_queue_t *zkrb_queue_alloc(void) {
   int pfd[2];
   if (pipe(pfd) == -1)
@@ -187,14 +195,14 @@ VALUE zkrb_event_to_ruby(zkrb_event_t *event) {
     case ZKRB_DATA: {
       struct zkrb_data_completion *data_ctx = event->completion.data_completion;
       if (ZKRBDebugging) zkrb_print_stat(data_ctx->stat);
-      rb_hash_aset(hash, GET_SYM("data"), data_ctx->data ? rb_str_new2(data_ctx->data) : Qnil);
+      rb_hash_aset(hash, GET_SYM("data"), data_ctx->data ? rb_str_new(data_ctx->data, data_ctx->data_len) : Qnil);
       rb_hash_aset(hash, GET_SYM("stat"), data_ctx->stat ? zkrb_stat_to_rarray(data_ctx->stat) : Qnil);
       break;
     }
     case ZKRB_STAT: {
       struct zkrb_stat_completion *stat_ctx = event->completion.stat_completion;
       rb_hash_aset(hash, GET_SYM("stat"), stat_ctx->stat ? zkrb_stat_to_rarray(stat_ctx->stat) : Qnil);
-      break;      
+      break;
     }
     case ZKRB_STRING: {
       struct zkrb_string_completion *string_ctx = event->completion.string_completion;
@@ -328,14 +336,21 @@ void zkrb_data_callback(
   struct zkrb_data_completion *dc = malloc(sizeof(struct zkrb_data_completion));
   dc->data = NULL;
   dc->stat = NULL;
-  if (value != NULL) { dc->data  = malloc(value_len); memcpy(dc->data, value, value_len); }
+  dc->data_len = 0;
+
+  if (value != NULL) {
+    dc->data = malloc(value_len);
+    dc->data_len = value_len;
+    memcpy(dc->data, value, value_len);
+  }
+
   if (stat != NULL) { dc->stat  = malloc(sizeof(struct Stat)); memcpy(dc->stat, stat, sizeof(struct Stat)); }
 
   ZKH_SETUP_EVENT(queue, event);
   event->rc = rc;
   event->type = ZKRB_DATA;
   event->completion.data_completion = dc;
-  
+
   zkrb_enqueue(queue, event);
 }
 
@@ -354,7 +369,7 @@ void zkrb_stat_callback(
   event->rc = rc;
   event->type = ZKRB_STAT;
   event->completion.stat_completion = sc;
-  
+
   zkrb_enqueue(queue, event);
 }
 
@@ -374,7 +389,7 @@ void zkrb_string_callback(
   event->rc = rc;
   event->type = ZKRB_STRING;
   event->completion.string_completion = sc;
-  
+
   zkrb_enqueue(queue, event);
 }
 
@@ -393,7 +408,7 @@ void zkrb_strings_callback(
   event->rc = rc;
   event->type = ZKRB_STRINGS;
   event->completion.strings_completion = sc;
-  
+
   zkrb_enqueue(queue, event);
 }
 
@@ -413,7 +428,7 @@ void zkrb_strings_stat_callback(
   event->rc = rc;
   event->type = ZKRB_STRINGS_STAT;
   event->completion.strings_stat_completion = sc;
-  
+
   zkrb_enqueue(queue, event);
 }
 
@@ -428,7 +443,7 @@ void zkrb_void_callback(
   event->rc = rc;
   event->type = ZKRB_VOID;
   event->completion.void_completion = NULL;
-  
+
   zkrb_enqueue(queue, event);
 }
 
@@ -449,7 +464,7 @@ void zkrb_acl_callback(
   event->rc = rc;
   event->type = ZKRB_ACL;
   event->completion.acl_completion = ac;
-  
+
   /* should be synchronized */
   zkrb_enqueue(queue, event);
 }
@@ -487,22 +502,22 @@ struct ACL_vector * zkrb_ruby_to_aclvector(VALUE acl_ary) {
 #warning [wickman] TODO test zkrb_ruby_to_aclvector
 struct ACL zkrb_ruby_to_acl(VALUE rubyacl) {
   struct ACL acl;
-  
+
   VALUE perms  = rb_iv_get(rubyacl, "@perms");
   VALUE rubyid = rb_iv_get(rubyacl, "@id");
   acl.perms  = NUM2INT(perms);
   acl.id = zkrb_ruby_to_id(rubyid);
-  
+
   return acl;
 }
 
 #warning [wickman] TODO zkrb_ruby_to_id error checking? test
 struct Id zkrb_ruby_to_id(VALUE rubyid) {
   struct Id id;
-  
+
   VALUE scheme = rb_iv_get(rubyid, "@scheme");
   VALUE ident  = rb_iv_get(rubyid, "@id");
-  
+
   if (scheme != Qnil) {
     id.scheme = malloc(RSTRING_LEN(scheme) + 1);
     strncpy(id.scheme, RSTRING_PTR(scheme), RSTRING_LEN(scheme));
@@ -518,7 +533,7 @@ struct Id zkrb_ruby_to_id(VALUE rubyid) {
   } else {
     id.id = NULL;
   }
-  
+
   return id;
 }
 
@@ -542,17 +557,17 @@ VALUE zkrb_string_vector_to_ruby(struct String_vector *string_vector) {
 
 VALUE zkrb_stat_to_rarray(const struct Stat* stat) {
   return rb_ary_new3(11,
-		     LL2NUM(stat->czxid),
-		     LL2NUM(stat->mzxid),
-		     LL2NUM(stat->ctime),
-		     LL2NUM(stat->mtime),
-		     INT2NUM(stat->version),
-		     INT2NUM(stat->cversion),
-		     INT2NUM(stat->aversion),
-		     LL2NUM(stat->ephemeralOwner),
-		     INT2NUM(stat->dataLength),
-		     INT2NUM(stat->numChildren),
-		     LL2NUM(stat->pzxid));
+             LL2NUM(stat->czxid),
+             LL2NUM(stat->mzxid),
+             LL2NUM(stat->ctime),
+             LL2NUM(stat->mtime),
+             INT2NUM(stat->version),
+             INT2NUM(stat->cversion),
+             INT2NUM(stat->aversion),
+             LL2NUM(stat->ephemeralOwner),
+             INT2NUM(stat->dataLength),
+             INT2NUM(stat->numChildren),
+             LL2NUM(stat->pzxid));
 }
 
 VALUE zkrb_stat_to_rhash(const struct Stat *stat) {

data/ext/zookeeper_lib.h

@@ -26,6 +26,7 @@ extern pthread_mutex_t zkrb_q_mutex;
 
 struct zkrb_data_completion {
   char *data;
+  int data_len;
   struct Stat *stat;
 };
 
@@ -108,6 +109,7 @@ void           zkrb_event_free(zkrb_event_t *ptr);
 void                 zkrb_enqueue(zkrb_queue_t *queue, zkrb_event_t *elt);
 zkrb_event_t *       zkrb_peek(zkrb_queue_t *queue);
 zkrb_event_t *       zkrb_dequeue(zkrb_queue_t *queue, int need_lock);
+void                 zkrb_signal(zkrb_queue_t *queue);
 
 void zkrb_print_stat(const struct Stat *s);
 

data/lib/zookeeper.rb

@@ -22,7 +22,7 @@ class Zookeeper < CZookeeper
   ZOO_LOG_LEVEL_WARN   = 2
   ZOO_LOG_LEVEL_INFO   = 3
   ZOO_LOG_LEVEL_DEBUG  = 4
-  
+
   def reopen(timeout = 10)
     init(@host)
     if timeout > 0
@@ -34,6 +34,7 @@ class Zookeeper < CZookeeper
     end
     # flushes all outstanding watcher reqs.
     @watcher_reqs = { ZKRB_GLOBAL_CB_REQ => { :watcher => get_default_global_watcher } }
+    setup_dispatch_thread!
     state
   end
 
@@ -44,7 +45,6 @@ class Zookeeper < CZookeeper
     @current_req_id = 1
     @host = host
     return nil if reopen(timeout) != Zookeeper::ZOO_CONNECTED_STATE
-    setup_dispatch_thread!
   end
 
 public
@@ -52,14 +52,14 @@ public
     assert_open
     assert_supported_keys(options, [:path, :watcher, :watcher_context, :callback, :callback_context])
     assert_required_keys(options, [:path])
-    
+
     req_id = setup_call(options)
     rc, value, stat = super(req_id, options[:path], options[:callback], options[:watcher])
 
     rv = { :req_id => req_id, :rc => rc }
     options[:callback] ? rv : rv.merge(:data => value, :stat => Stat.new(stat))
   end
-  
+
   def set(options = {})
     assert_open
     assert_supported_keys(options, [:path, :data, :version, :callback, :callback_context])
@@ -72,7 +72,7 @@ public
     rv = { :req_id => req_id, :rc => rc }
     options[:callback] ? rv : rv.merge(:stat => Stat.new(stat))
   end
-  
+
   def get_children(options = {})
     assert_open
     assert_supported_keys(options, [:path, :callback, :callback_context, :watcher, :watcher_context])
@@ -96,34 +96,34 @@ public
     rv = { :req_id => req_id, :rc => rc }
     options[:callback] ? rv : rv.merge(:stat => Stat.new(stat))
   end
-  
+
   def create(options = {})
     assert_open
     assert_supported_keys(options, [:path, :data, :acl, :ephemeral, :sequence, :callback, :callback_context])
     assert_required_keys(options, [:path])
-    
+
     flags = 0
     flags |= ZOO_EPHEMERAL if options[:ephemeral]
     flags |= ZOO_SEQUENCE if options[:sequence]
 
     options[:acl] ||= ZOO_OPEN_ACL_UNSAFE
-    
+
     req_id = setup_call(options)
     rc, newpath = super(req_id, options[:path], options[:data], options[:callback], options[:acl], flags)
-    
+
     rv = { :req_id => req_id, :rc => rc }
-    options[:callback] ? rv : rv.merge(:path => newpath) 
+    options[:callback] ? rv : rv.merge(:path => newpath)
   end
-  
+
   def delete(options = {})
     assert_open
     assert_supported_keys(options, [:path, :version, :callback, :callback_context])
     assert_required_keys(options, [:path])
     options[:version] ||= -1
-    
+
     req_id = setup_call(options)
     rc = super(req_id, options[:path], options[:version], options[:callback])
-    
+
     { :req_id => req_id, :rc => rc }
   end
 
@@ -132,46 +132,55 @@ public
     assert_supported_keys(options, [:path, :acl, :version, :callback, :callback_context])
     assert_required_keys(options, [:path, :acl])
     options[:version] ||= -1
-    
+
     req_id = setup_call(options)
     rc = super(req_id, options[:path], options[:acl], options[:callback], options[:version])
-    
+
     { :req_id => req_id, :rc => rc }
   end
-  
+
   def get_acl(options = {})
     assert_open
     assert_supported_keys(options, [:path, :callback, :callback_context])
     assert_required_keys(options, [:path])
-    
+
     req_id = setup_call(options)
     rc, acls, stat = super(req_id, options[:path], options[:callback])
-    
+
     rv = { :req_id => req_id, :rc => rc }
     options[:callback] ? rv : rv.merge(:acl => acls, :stat => Stat.new(stat))
   end
 
+  # To close a Zk handle, first shutdown the dispatcher thread; this is done by
+  # signalling the waiting thread that there is a pending close. We then release
+  # the C-land Zk state.
+  def close
+    signal_pending_close
+    @dispatcher.join
+    super
+  end
+
 private
   def setup_dispatch_thread!
     @dispatcher = Thread.new {
       while true do
-        dispatch_next_callback
+        hash = get_next_event
+        break if hash.nil? # Pending close => exit dispatcher thread
+        dispatch_event(hash)
       end
     }
   end
 
-  def dispatch_next_callback
-    hash = get_next_event
-
+  def dispatch_event(hash)
     is_completion = hash.has_key?(:rc)
-    
+
     hash[:stat] = Stat.new(hash[:stat]) if hash.has_key?(:stat)
     hash[:acl] = hash[:acl].map { |acl| ACL.new(acl) } if hash[:acl]
-    
+
     callback_context = is_completion ? get_completion(hash[:req_id]) : get_watcher(hash[:req_id])
     callback = is_completion ? callback_context[:callback] : callback_context[:watcher]
     hash[:context] = callback_context[:context]
-    
+
     # TODO: Eventually enforce derivation from Zookeeper::Callback
     if callback.respond_to?(:call)
       callback.call(hash)
@@ -179,7 +188,7 @@ private
       # puts "dispatch_next_callback found non-callback => #{callback.inspect}"
     end
   end
-  
+
   def setup_call(opts)
     req_id = nil
     @req_mutex.synchronize {
@@ -190,7 +199,7 @@ private
     }
     req_id
   end
-  
+
   def setup_watcher(req_id, call_opts)
     @watcher_reqs[req_id] = { :watcher => call_opts[:watcher],
                               :context => call_opts[:watcher_context] }
@@ -200,13 +209,13 @@ private
     @completion_reqs[req_id] = { :callback => call_opts[:callback],
                                  :context => call_opts[:callback_context] }
   end
-  
+
   def get_watcher(req_id)
     @req_mutex.synchronize {
       req_id != ZKRB_GLOBAL_CB_REQ ? @watcher_reqs.delete(req_id) : @watcher_reqs[req_id]
     }
   end
-  
+
   def get_completion(req_id)
     @req_mutex.synchronize { @completion_reqs.delete(req_id) }
   end

data/zookeeper.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zookeeper}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Phillip Pearson, Eric Maland, Evan Weaver, Brian Wickman"]
-  s.date = %q{2011-02-09}
+  s.date = %q{2011-03-30}
   s.description = %q{An interface to the Zookeeper distributed configuration server.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "ext/zookeeper_c.c", "lib/zookeeper.rb"]
   s.files = ["CHANGELOG", "LICENSE", "README", "Rakefile", "examples/cloud_config.rb", "ext/extconf.rb", "ext/zkc-3.3.2.tar.gz", "ext/zookeeper_c.c", "ext/zookeeper_lib.c", "ext/zookeeper_lib.h", "lib/zookeeper.rb", "lib/zookeeper/acls.rb", "lib/zookeeper/callbacks.rb", "lib/zookeeper/constants.rb", "lib/zookeeper/exceptions.rb", "lib/zookeeper/stat.rb", "test/test_basic.rb", "test/test_callback1.rb", "test/test_close.rb", "test/test_esoteric.rb", "test/test_watcher1.rb", "test/test_watcher2.rb", "Manifest", "zookeeper.gemspec"]
-  s.homepage = %q{https://github.com/twitter/zookeeper}
+  s.homepage = %q{http://twitter.github.com/twitter/zookeeper/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Zookeeper", "--main", "README"]
   s.require_paths = ["lib", "ext"]
-  s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.5.0}
+  s.rubyforge_project = %q{twitter}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{An interface to the Zookeeper distributed configuration server.}
   s.test_files = ["test/test_basic.rb", "test/test_callback1.rb", "test/test_close.rb", "test/test_esoteric.rb", "test/test_watcher1.rb", "test/test_watcher2.rb"]
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Phillip Pearson, Eric Maland, Evan Weaver, Brian Wickman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -08:00
+date: 2011-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -57,7 +57,7 @@ files:
 - Manifest
 - zookeeper.gemspec
 has_rdoc: true
-homepage: https://github.com/twitter/zookeeper
+homepage: http://twitter.github.com/twitter/zookeeper/
 licenses: []
 
 post_install_message: 
@@ -92,8 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "1.2"
 requirements: []
 
-rubyforge_project: fauna
-rubygems_version: 1.5.0
+rubyforge_project: twitter
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: An interface to the Zookeeper distributed configuration server.