droonga-engine 1.0.4 → 1.0.5

data/lib/droonga/slice.rb

@@ -11,13 +11,10 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-require "serverengine"
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/loggable"
-require "droonga/server"
-require "droonga/worker"
+require "droonga/supervisor"
 require "droonga/event_loop"
 require "droonga/job_pusher"
 require "droonga/processor"
@@ -27,21 +24,24 @@ module Droonga
   class Slice
     include Loggable
 
+    attr_accessor :on_ready
     def initialize(dataset, loop, options={})
       @dataset = dataset
       @loop = loop
       @options = options
       @n_workers = @options[:n_workers] || 0
-      @job_pusher = JobPusher.new(@loop, @options[:database])
+      @database_path = @options[:database]
+      @job_pusher = JobPusher.new(@loop, @database_path)
       @processor = Processor.new(@loop, @job_pusher, @options)
       @supervisor = nil
+      @on_ready = nil
     end
 
     def start
       ensure_database
       @processor.start
       @job_pusher.start
-      start_supervisor if @n_workers > 0
+      start_supervisor
     end
 
     def shutdown
@@ -63,14 +63,13 @@ module Droonga
       enforce_umask
       context = Groonga::Context.new
       begin
-        database_path = @options[:database]
-        if File.exist?(database_path)
-          context.open_database(database_path) do
+        if File.exist?(@database_path)
+          context.open_database(@database_path) do
             apply_schema(context)
           end
         else
-          FileUtils.mkdir_p(File.dirname(database_path))
-          context.create_database(database_path) do
+          FileUtils.mkdir_p(File.dirname(@database_path))
+          context.create_database(@database_path) do
             apply_schema(context)
           end
         end
@@ -89,32 +88,35 @@ module Droonga
     end
 
     def start_supervisor
-      @supervisor = ServerEngine::Supervisor.new(Server, Worker) do
-        force_options = {
-          :worker_type   => "process",
-          :workers       => @options[:n_workers],
-          :log_level     => logger.level,
-          :server_process_name => "Server[#{@options[:database]}] #$0",
-          :worker_process_name => "Worker[#{@options[:database]}] #$0",
-          :job_receive_socket_path => @job_pusher.socket_path,
-          :job_pusher => @job_pusher,
-        }
-        @options.merge(force_options)
+      if @n_workers.zero?
+        on_ready
+        return
       end
-      @supervisor_thread = Thread.new do
-        @supervisor.main
+
+      config = Supervisor::WorkerConfiguration.new
+      config.name = @options[:name]
+      config.dataset = @dataset
+      config.database_path = @database_path
+      config.plugins = @options[:plugins]
+      config.job_pusher = @job_pusher
+      @supervisor = Supervisor.new(@loop, @n_workers, config)
+      @supervisor.on_ready = lambda do
+        on_ready
       end
+      @supervisor.start
     end
 
     def shutdown_supervisor
       logger.trace("supervisor: shutdown: start")
-      @supervisor.stop(true)
-      logger.trace("supervisor: shutdown: stopped")
-      @supervisor_thread.join
+      @supervisor.stop_gracefully
       logger.trace("supervisor: shutdown: done")
     end
 
     private
+    def on_ready
+      @on_ready.call if @on_ready
+    end
+
     def log_tag
       "slice"
     end

data/lib/droonga/status_code.rb

@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   module StatusCode

data/lib/droonga/step_runner.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/loggable"
 require "droonga/plugin"

data/lib/droonga/supervisor.rb

@@ -0,0 +1,170 @@
+# Copyright (C) 2014 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "droonga/loggable"
+require "droonga/process_supervisor"
+
+module Droonga
+  class Supervisor
+    include Loggable
+
+    attr_writer :on_ready
+    def initialize(loop, n_workers, config)
+      @loop = loop
+      @n_workers = n_workers
+      @config = config
+      @on_ready = nil
+    end
+
+    def start
+      n_ready_workers = 0
+      @worker_runners = @n_workers.times.collect do |i|
+        worker_runner = WorkerRunner.new(@loop, i, @config)
+        worker_runner.on_ready = lambda do
+          n_ready_workers += 1
+          if n_ready_workers == @n_workers
+            @on_ready.call if @on_ready
+          end
+        end
+        worker_runner.start
+        # TODO: support auto re-run
+        worker_runner
+      end
+    end
+
+    def stop_gracefully
+      @worker_runners.each do |worker_runner|
+        worker_runner.stop_gracefully
+      end
+    end
+
+    def stop_immediately
+      @worker_runners.each do |worker_runner|
+        worker_runner.stop_immediately
+      end
+    end
+
+    private
+    def log_tag
+      "supervisor"
+    end
+
+    class WorkerConfiguration
+      attr_accessor :name
+      attr_accessor :dataset
+      attr_accessor :database_path
+      attr_accessor :plugins
+      attr_accessor :job_pusher
+      def initialize
+        @name = nil
+        @dataset = nil
+        @database_path = nil
+        @plugins = []
+        @job_pusher = nil
+      end
+    end
+
+    class WorkerRunner
+      include Loggable
+
+      attr_writer :on_ready
+      attr_writer :on_failure
+      def initialize(loop, id, config)
+        @loop = loop
+        @id = id
+        @config = config
+        @on_ready = nil
+        @on_failure = nil
+      end
+
+      def start
+        control_write_in, control_write_out = IO.pipe
+        control_read_in, control_read_out = IO.pipe
+        env = {}
+        command_line = [
+          RbConfig.ruby,
+          "-S",
+          "droonga-engine-worker",
+          "--control-read-fd", control_write_in.fileno.to_s,
+          "--control-write-fd", control_read_out.fileno.to_s,
+          "--job-queue-socket-path", @config.job_pusher.socket_path.to_s,
+          "--pid-file", pid_path.to_s,
+          "--dataset", @config.dataset.name,
+          "--database-path", @config.database_path.to_s,
+          "--plugins", @config.plugins.join(","),
+        ]
+        options = {
+          control_write_in => control_write_in,
+          control_read_out => control_read_out,
+        }
+        @pid = spawn(env, *command_line, options)
+        control_write_in.close
+        control_read_out.close
+        @supervisor = create_process_supervisor(control_read_in,
+                                                control_write_out)
+        @supervisor.start
+      end
+
+      def stop_gracefully
+        @supervisor.stop_gracefully
+      end
+
+      def stop_immediately
+        @supervisor.stop_immediately
+      end
+
+      def success?
+        @success
+      end
+
+      private
+      def pid_path
+        @config.database_path + "droonga-worker-#{@id}.pid"
+      end
+
+      def create_process_supervisor(input, output)
+        supervisor = ProcessSupervisor.new(@loop, input, output)
+        supervisor.on_ready = lambda do
+          on_ready
+        end
+        supervisor.on_finish = lambda do
+          on_finish
+        end
+        supervisor
+      end
+
+      def on_ready
+        @on_ready.call if @on_ready
+      end
+
+      def on_failure
+        # TODO: log
+        @on_failure.call if @on_failure
+      end
+
+      def on_finish
+        _, status = Process.waitpid2(@pid)
+        @success = status.success?
+        @supervisor.stop
+        on_failure unless success?
+      end
+
+      private
+      def log_tag
+        "worker-runner"
+      end
+    end
+  end
+end

data/lib/droonga/sweeper.rb

@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   class Sweeper

data/lib/droonga/test/stub_handler.rb

@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   module Test

data/lib/droonga/test/stub_handler_message.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/handler_message"
 

data/lib/droonga/test/stub_handler_messenger.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   module Test

data/lib/droonga/test/stub_planner.rb

@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   module Test

data/lib/droonga/test.rb

@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/test/stub_planner"
 require "droonga/test/stub_handler"

data/lib/droonga/watch_schema.rb

@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "groonga"
 
@@ -86,7 +86,7 @@ module Droonga
     end
 
     def log_tag
-      "[#{Process.ppid}][#{Process.pid}] watch_schema"
+      "[#{Process.ppid}] watch_schema"
     end
   end
 end

data/lib/droonga/watcher.rb

@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Droonga
   class Watcher

data/lib/droonga/worker_process_agent.rb

@@ -0,0 +1,111 @@
+# Copyright (C) 2014 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "coolio"
+
+require "droonga/process_control_protocol"
+require "droonga/line_buffer"
+
+module Droonga
+  class WorkerProcessAgent
+    include ProcessControlProtocol
+
+    def initialize(loop, input, output)
+      @loop = loop
+      create_input(input)
+      create_output(output)
+      @on_ready = nil
+      @on_finish = nil
+    end
+
+    def start
+      @loop.attach(@input)
+      @loop.attach(@output)
+    end
+
+    def stop
+      if @output
+        @output, output = nil, @output
+        output.write(Messages::FINISH)
+        output.close
+      end
+      if @input
+        @input, input = nil, @input
+        input.close
+      end
+    end
+
+    def ready
+      @output.write(Messages::READY)
+    end
+
+    def on_stop_gracefully=(callback)
+      @on_stop_gracefully = callback
+    end
+
+    def on_stop_immediately=(callback)
+      @on_stop_immediately = callback
+    end
+
+    private
+    def create_input(raw_input)
+      @input = Coolio::IO.new(raw_input)
+      on_read = lambda do |data|
+        line_buffer = LineBuffer.new
+        line_buffer.feed(data) do |line|
+          case line
+          when Messages::STOP_GRACEFUL
+            on_stop_gracefully
+          when Messages::STOP_IMMEDIATELY
+            on_stop_immediately
+          end
+        end
+      end
+      @input.on_read do |data|
+        on_read.call(data)
+      end
+      on_close = lambda do
+        if @input
+          @input = nil
+          on_stop_immediately
+        end
+      end
+      @input.on_close do
+        on_close.call
+      end
+    end
+
+    def create_output(raw_output)
+      @output = Coolio::IO.new(raw_output)
+      on_close = lambda do
+        if @output
+          @output = nil
+          on_stop_immediately
+        end
+      end
+      @output.on_close do
+        on_close.call
+      end
+    end
+
+    def on_stop_gracefully
+      @on_stop_gracefully.call if @on_stop_gracefully
+    end
+
+    def on_stop_immediately
+      @on_stop_immediately.call if @on_stop_immediately
+    end
+  end
+end

data/sample/cluster/Rakefile

@@ -0,0 +1,150 @@
+# -*- ruby -*-
+#
+# Copyright (C) 2014 Droonga Project
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+require "pathname"
+require "json"
+
+base_dir_path = Pathname.new(__FILE__).dirname
+top_dir_path = base_dir_path.parent.parent
+bin_dir_path = top_dir_path + "bin"
+lib_dir_path = top_dir_path + "lib"
+
+$LOAD_PATH.unshift(lib_dir_path.to_s)
+
+class DroongaEngine
+  include Rake::DSL
+
+  class << self
+    def host(node_id)
+      "127.0.#{200 + node_id}.1"
+    end
+
+    def port
+      22000
+    end
+  end
+
+  def initialize(base_dir_path, node_id)
+    @base_dir_path = base_dir_path
+    @node_id = node_id
+    @pid = nil
+  end
+
+  def setup(node_ids)
+    rm_rf(working_dir_path.to_s)
+    mkdir_p(working_dir_path.to_s)
+    generate_catalog(node_ids)
+  end
+
+  def start
+    @pid = spawn("droonga-engine",
+                 "--base-dir", working_dir_path.to_s,
+                 "--host", host,
+                 "--port", self.class.port.to_s,
+                 "--pid-file", pid_file_path.to_s)
+  end
+
+  def stop
+    Process.kill(:TERM, @pid)
+    Process.waitpid(@pid)
+    @pid = nil
+  end
+
+  def host
+    self.class.host(@node_id)
+  end
+
+  private
+  def working_dir_path
+    @base_dir_path + @node_id.to_s
+  end
+
+  def catalog_path
+    working_dir_path + "catalog.json"
+  end
+
+  def pid_file_path
+    working_dir_path + "droonga-engine.pid"
+  end
+
+  def generate_catalog(node_ids)
+    hosts = node_ids.collect do |node_id|
+      self.class.host(node_id)
+    end
+    sh("droonga-engine-catalog-generate",
+       "--output", catalog_path.to_s,
+       "--n-workers", "3",
+       "--hosts", hosts.join(","),
+       "--port", self.class.port.to_s)
+  end
+end
+
+namespace :droonga do
+  node_ids = [0, 1, 2]
+
+  namespace :prepare do
+    task :path do
+      paths = [
+        bin_dir_path.to_s,
+        ENV["PATH"],
+      ].compact
+      ENV["PATH"] = paths.join(File::PATH_SEPARATOR)
+    end
+
+    task :load_path do
+      load_paths = [
+        lib_dir_path.to_s,
+        ENV["RUBYLIB"],
+      ].compact
+      ENV["RUBYLIB"] = load_paths.join(File::PATH_SEPARATOR)
+    end
+  end
+
+  task :prepare => ["prepare:path", "prepare:load_path"]
+
+  desc "Set up Droonga cluster."
+  task :setup => :prepare do
+    node_ids.each do |node_id|
+      engine = DroongaEngine.new(base_dir_path, node_id)
+      engine.setup(node_ids)
+    end
+  end
+
+  desc "Run Droonga cluster."
+  task :run => :prepare do
+    processes = []
+    begin
+      node_ids.each do |node_id|
+        engine = DroongaEngine.new(base_dir_path, node_id)
+        engine.start
+        processes << engine
+        host = engine.host
+        port = DroongaEngine.port
+        puts("#{host}:#{port}/droonga")
+      end
+      front_node_id = node_ids.first
+      $stdin.gets
+    ensure
+      stop_threads = processes.collect do |process|
+        Thread.new do
+          process.stop
+        end
+      end
+      stop_threads.each(&:join)
+    end
+  end
+end