zk-server 0.9.1 → 1.0.0

data/lib/zk-server/java_embedded.rb

@@ -0,0 +1,128 @@
+require 'java'
+
+module ZK
+  module Server
+    # gah, this needs to be a singleton, but whaddyagonnado
+    class JavaEmbedded < Base
+      System = java.lang.System
+
+      JFile = java.io.File
+
+      attr_reader :zookeeper_thread
+      
+      # yeah, holla atcha boy, JZ
+      module JZ
+        # ok, this is seriously seriously ugly, but we want to dynamically
+        # config log4j in this process which would require brain surgery if 
+        # i didn't do it dynamically, therefore we need to have all of this stuff
+        # bind late, and we want some readable shortcuts to these fully-qualified
+        # path names *after* we've done our requires in 'require_dependencies'
+        #
+        # so, yeah, sorry about this
+
+        def self.dynamically_create_consts
+          hash = { 
+            :Quorum         => org.apache.zookeeper.server.quorum,
+            :Server         => org.apache.zookeeper.server,
+            :FileTxnSnapLog => org.apache.zookeeper.server.persistence.FileTxnSnapLog 
+          }
+          
+          hash.each do |k,v|
+            const_set(k, v) unless const_defined?(k)
+          end
+        end
+      end
+
+      def shutdown
+        @mutex.synchronize do
+          return unless @run_called and @cnxn_factory and @zk_server and running?
+
+          @cnxn_factory.shutdown
+          @zk_server.shutdown
+        end
+
+        @zookeeper_thread and @zookeeper_thread.join(5)
+      end
+
+      def running?
+        @mutex.synchronize do
+          @zk_server && @zk_server.running?
+        end
+      end
+
+      def run
+        @mutex.synchronize do
+          return false if @run_called
+          @run_called = true
+
+          create_files!
+          require_dependencies
+          spawn_zookeeper_thread!
+          wait_until_ping
+          true
+        end
+      end
+
+      def spawned?
+        !!@zookeeper_thread
+      end
+
+      def pid
+        $$ # CHEEKY!!
+      end
+
+      def logging_related_system_properties
+        [ ['log4j.configuration', "file://#{ZK::Server.default_log4j_props_path}"],
+          ['zookeeper.log.dir', config.log_dir],
+          ['zookeeper.root.logger', 'INFO,CONSOLE'], ]
+      end
+
+      # XXX: this assumes that we're only going to ever run one of these per
+      #      process (or at least have only one log)
+      def require_dependencies
+        logging_related_system_properties.each do |k,v|
+          System.set_property(k,v)
+        end
+
+        require 'log4j'
+        require 'zookeeper_jar'
+
+        JZ.dynamically_create_consts
+      end
+      
+
+      def spawn_zookeeper_thread!
+        @zookeeper_thread ||= Thread.new do
+          Thread.abort_on_exception = true
+          cnxn_factory.startup(zk_server)
+          cnxn_factory.join
+          cnxn_factory.shutdown
+
+          @mutex.synchronize do
+            @exit_cond.broadcast
+          end
+        end
+      end
+
+      def cnxn_factory
+        @cnxn_factory ||= JZ::Server::NIOServerCnxn::Factory.new(zk_config.client_port_address, zk_config.max_client_cnxns)
+      end
+
+      def j_data_log_dir
+        @j_data_log_dir ||= JFile.new(zk_config.data_log_dir)
+      end
+
+      def j_data_dir
+        @j_data_dir ||= JFile.new(zk_config.data_dir)
+      end
+
+      def zk_server
+        @zk_server ||= JZ::Server::ZooKeeperServer.new(j_data_log_dir, j_data_dir, zk_config.tick_time)
+      end
+
+      def zk_config
+        @zk_config ||= JZ::Server::ServerConfig.new.tap { |c| c.parse(zoo_cfg_path) }
+      end
+    end
+  end
+end

data/lib/zk-server/version.rb

@@ -1,5 +1,5 @@
 module ZK
   module Server
-    VERSION = "0.9.1" unless defined?(::ZK::Server::VERSION)
+    VERSION = "1.0.0" unless defined?(::ZK::Server::VERSION)
   end
 end

data/lib/zk-server.rb

@@ -35,6 +35,10 @@ module ZK
       defined?(::JRUBY_VERSION)
     end
 
+    def self.jruby_18?
+      jruby? and ruby_187?
+    end
+
     def self.jruby_19?
       jruby? and ruby_19?
     end
@@ -48,7 +52,9 @@ module ZK
     #
     # @yield [Config] server config instance if block given
     def self.new(opts={})
-      SubProcess.new(opts).tap do |server|
+      klass = jruby? ? JavaEmbedded : SubProcess
+
+      klass.new(opts).tap do |server|
         yield server.config if block_given?
       end
     end
@@ -125,7 +131,7 @@ require 'zk-server/config'
 require 'zk-server/base'
 require 'zk-server/sub_process'
 
-# if defined?(::JRUBY_VERSION)
-#   require 'zk-server/java_embedded'
-# end
+if defined?(::JRUBY_VERSION)
+  require 'zk-server/java_embedded'
+end
 

data/spec/zk-server/java_embedded_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+if defined?(::JRUBY_VERSION)
+
+  describe ZK::Server::JavaEmbedded do
+    let(:tmpdir) { '/tmp/zookeeper' }
+
+    subject do 
+      described_class.new(:client_port => 21812, :base_dir => tmpdir)
+    end
+
+    after do 
+      subject.shutdown
+      subject.clobber!
+      FileUtils.rm_rf(tmpdir)
+    end
+ 
+
+    it %[should run the zk server, ping, and then shutdown properly] do
+      subject.run
+      subject.should be_pingable
+      subject.should be_running
+      subject.should be_spawned
+
+      subject.shutdown
+
+      subject.should_not be_pingable
+      subject.should_not be_running
+    end
+  end
+end
+

data/spec/zk-server/process_spec.rb

@@ -14,7 +14,7 @@ describe ZK::Server::SubProcess do
   end
 
   it %[should spawn a ZK server, ping, and then shutdown properly] do
-#     pending "cannot run this under JRuby" if defined?(::JRUBY_VERSION)
+    pending "cannot run this under JRuby" if defined?(::JRUBY_VERSION)
 
     subject.run
     subject.should be_pingable

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zk-server
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 23
   prerelease: 
   segments: 
-  - 0
-  - 9
   - 1
-  version: 0.9.1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Jonathan D. Simms
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 Z
+date: 2012-05-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -86,11 +86,13 @@ files:
 - lib/zk-server.rb
 - lib/zk-server/base.rb
 - lib/zk-server/config.rb
+- lib/zk-server/java_embedded.rb
 - lib/zk-server/log4j.properties
 - lib/zk-server/logging.rb
 - lib/zk-server/sub_process.rb
 - lib/zk-server/version.rb
 - spec/spec_helper.rb
+- spec/zk-server/java_embedded_spec.rb
 - spec/zk-server/process_spec.rb
 - zk-server.gemspec
 homepage: http://github.com/slyphon/zk-server
@@ -128,4 +130,5 @@ specification_version: 3
 summary: runs a standalone zookeeper server
 test_files: 
 - spec/spec_helper.rb
+- spec/zk-server/java_embedded_spec.rb
 - spec/zk-server/process_spec.rb