droonga-engine 1.0.9 → 1.1.0

data/bin/droonga-engine-set-role

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+#
+# Copyright (C) 2014-2015 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/command/remote_command_base"
+
+module Droonga
+  module Command
+    class SetRole < RemoteCommandBase
+      def run
+        parse_options do |option|
+          option.on(:role=,
+                    "New role for the target node.",
+                    :required => true)
+        end
+
+        if serf.role == @options[:role]
+          puts "Role of #{node.to_s} is #{@options[:role]}. Nothing to do."
+          return true
+        end
+
+        puts "Setting role of #{node.to_s} to #{@options[:role]}..."
+        succeeded = set_node_role
+
+        puts("Done.") if succeeded
+        succeeded
+      end
+
+      private
+      def set_node_role
+        serf.ensure_restarted do
+          serf.send_query("change_role",
+                          "node" => node.to_s,
+                          "role" => @options[:role])
+        end
+      end
+    end
+  end
+end
+
+exit(Droonga::Command::SetRole.new.run)

data/bin/droonga-engine-unjoin

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2014 Droonga Project
+# Copyright (C) 2014-2015 Droonga Project
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -15,121 +15,116 @@
 # 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 "slop"
-require "json"
-require "pathname"
+require "socket"
 
-require "droonga/engine/version"
-require "droonga/path"
-require "droonga/catalog_fetcher"
-require "droonga/catalog_generator"
+require "droonga/command/remote_command_base"
+require "droonga/node_name"
+require "droonga/catalog/dataset"
+require "droonga/catalog/loader"
+require "droonga/catalog/fetcher"
+require "droonga/catalog/generator"
 require "droonga/serf"
 
-class UnjoinCommand
-  def run
-    parse_options
-
-    puts "Start to unjoin a node #{@options[:host]}"
-    puts "                    by #{@options["receiver-host"]} (this host)"
-    puts ""
-
-    do_unjoin
-
-    puts("Done.")
-    exit(true)
-  end
-
-  private
-  def parse_options
-    options = Slop.parse(:help => true) do |option|
-      option.on(:host=,
-                "Host name of the replica removed from cluster.",
-                :required => true)
-      option.on("receiver-host=",
-                "Host name of this host.",
-                :default => Socket.gethostname)
-      option.on(:dataset=,
-                "Dataset name of for the node to be unjoined.",
-                :default => Droonga::CatalogGenerator::DEFAULT_DATASET)
-      option.on(:port=,
-                "Port number of the source cluster to be connected.",
-                :as => Integer,
-                :default => Droonga::CatalogGenerator::DEFAULT_PORT)
-      option.on(:tag=,
-                "Tag name of the soruce cluster to be connected.",
-                :default => Droonga::CatalogGenerator::DEFAULT_TAG)
-    end
-    @options = options
-  rescue Slop::MissingOptionError => error
-    $stderr.puts(error)
-    exit(false)
-  end
-
-  def replica_remove_host
-    @options[:host]
-  end
-
-  def tag
-    @options[:tag]
-  end
-
-  def port
-    @options[:port]
-  end
-
-  def dataset_name
-    @options[:dataset]
-  end
-
-  def replica_remove_node
-    "#{replica_remove_host}:#{port}/#{tag}"
-  end
-
-  def fetch_catalog
-    fetcher = Droonga::CatalogFetcher.new(:host          => replica_remove_host,
-                                          :port          => port,
-                                          :tag           => tag,
-                                          :receiver_host => @options["receiver-host"])
-    fetcher.fetch(:dataset => dataset_name)
-  end
-
-  def remaining_node
-    @remaining_node ||= detect_remaining_node
-  end
-
-  def detect_remaining_node
-    catalog = fetch_catalog
-    generator = Droonga::CatalogGenerator.new
-    generator.load(catalog)
-
-    dataset = generator.dataset_for_host(replica_remove_host)
-    unless dataset
-      raise "Specified host #{replica_remove_host} is not a member of "+
-              "the cluster. You must specify correct host via --replica-remove-host " +
-              "option."
+module Droonga
+  module Command
+    class Unjoin < RemoteCommandBase
+      def run
+        parse_options do |option|
+          option.on("receiver-host=",
+                    "Host name of this host.",
+                    :default => Socket.gethostname)
+          option.on(:dataset=,
+                    "Dataset name of for the node to be unjoined.",
+                    :default => Catalog::Dataset::DEFAULT_NAME)
+        end
+
+        puts "Start to unjoin a node #{node.to_s}"
+        puts "                    by #{@options["receiver-host"]} (this host)"
+        puts ""
+
+        succeeded = do_unjoin
+
+        puts("Done.") if succeeded
+        succeeded
+      end
+
+      def replica_remove_host
+        host
+      end
+
+      def replica_remove_node
+        node
+      end
+
+      def dataset_name
+        @options[:dataset]
+      end
+
+      def cluster_id
+        catalog.cluster_id
+      end
+
+      def catalog
+        @catalog ||= parse_catalog
+      end
+
+      def parse_catalog
+        loader = Catalog::Loader.new
+        loader.parse(raw_catalog)
+      end
+
+      def raw_catalog
+        @raw_catalog ||= fetch_catalog
+      end
+
+      def fetch_catalog
+        fetcher = Catalog::Fetcher.new(:host          => replica_remove_host,
+                                       :port          => port,
+                                       :tag           => tag,
+                                       :receiver_host => @options["receiver-host"])
+        fetcher.fetch(:dataset => dataset_name)
+      end
+
+      def remaining_node
+        @remaining_node ||= prepare_remaining_node
+      end
+
+      def remaining_node_serf
+        @remaining_node_serf ||= Serf.new(remaining_node.to_s,
+                                          :verbose => @options[:verbose])
+      end
+
+      def prepare_remaining_node
+        generator = Catalog::Generator.new
+        generator.load(raw_catalog)
+
+        dataset = generator.dataset_for_host(replica_remove_host)
+        unless dataset
+          raise "Specified host #{replica_remove_host} is not a member of "+
+                  "the cluster. You must specify correct host via --replica-remove-host " +
+                  "option."
+        end
+
+        other_hosts = dataset.replicas.hosts
+
+        remaining_host = other_hosts.first || replica_remove_host
+        NodeName.new(:host => remaining_host,
+                     :port => port,
+                     :tag  => tag)
+      end
+
+      def do_unjoin
+        puts "Unjoining replica from the cluster..."
+
+        remaining_node_serf.ensure_restarted do
+          remaining_node_serf.send_query("unjoin",
+                                         "cluster_id" => cluster_id,
+                                         "dataset"    => dataset_name,
+                                         "hosts"      => [replica_remove_host])
+        end
+      end
     end
-
-    other_hosts = dataset.replicas.hosts
-
-    remaining_host = other_hosts.first || replica_remove_host
-    "#{remaining_host}:#{port}/#{tag}"
-  end
-
-  def run_remote_command(target, command, options)
-    serf = Droonga::Serf.new(nil, target)
-    result = serf.send_query(command, options)
-    puts(result[:result])
-    puts(result[:error]) unless result[:error].empty?
-    result[:response]
-  end
-
-  def do_unjoin
-    puts "Unjoining replica from the cluster..."
-
-    run_remote_command(remaining_node, "unjoin",
-                       "dataset" => dataset_name,
-                       "hosts"   => [replica_remove_host])
   end
 end
 
-UnjoinCommand.new.run
+exit(Droonga::Command::Unjoin.new.run)

data/droonga-engine.gemspec

@@ -36,8 +36,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_dependency "archive-zip"
-  gem.add_dependency "cool.io"
-  gem.add_dependency "drndump"
+  gem.add_dependency "cool.io", ">= 1.3.0"
+  gem.add_dependency "drndump", ">= 1.0.1"
   gem.add_dependency "droonga-client", ">= 0.1.9"
   gem.add_dependency "droonga-message-pack-packer", ">= 1.0.2"
   gem.add_dependency "groonga-command-parser"
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "json"
   gem.add_dependency "rroonga", ">= 4.0.4"
   gem.add_dependency "sigdump"
-  gem.add_dependency "slop"
+  gem.add_dependency "slop", "<= 3.6.0"
   gem.add_dependency "sys-proctable"
   gem.add_development_dependency "kramdown"
   gem.add_development_dependency "bundler"

data/install.sh

@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Droonga Project
+# Copyright (C) 2014-2015 Droonga Project
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -36,6 +36,11 @@
 NAME=droonga-engine
 DOWNLOAD_URL_BASE=https://raw.githubusercontent.com/droonga/$NAME
 REPOSITORY_URL=https://github.com/droonga/$NAME.git
+DROONGA_CLIENT_RUBY_REPOSITORY_URL=https://github.com/droonga/droonga-client-ruby.git
+DRNDUMP_REPOSITORY_URL=https://github.com/droonga/drndump.git
+RROONGA_REPOSITORY_URL=https://github.com/ranguba/rroonga.git
+GROONGA_COMMAND_REPOSITORY_URL=https://github.com/groonga/groonga-command.git
+GROONGA_COMMAND_PARSER_REPOSITORY_URL=https://github.com/groonga/groonga-command-parser.git
 USER=$NAME
 GROUP=droonga
 DROONGA_BASE_DIR=/home/$USER/droonga
@@ -44,6 +49,7 @@ TEMPDIR=/tmp/install-$NAME
 : ${VERSION:=release}
 : ${HOST:=Auto Detect}
 : ${PORT:=10031}
+: ${INSTALL_FROM_REPOSITORY:=$NAME}
 
 case $(uname) in
   Darwin|*BSD|CYGWIN*) sed="sed -E" ;;
@@ -181,7 +187,7 @@ determine_hostname() {
 }
 
 download_url() {
-  if [ "$VERSION" = "master" ]; then
+  if [ "$VERSION" != "release" ]; then
     echo "$DOWNLOAD_URL_BASE/master/$1"
   else
     echo "$DOWNLOAD_URL_BASE/v$(installed_version)/$1"
@@ -192,48 +198,61 @@ installed_version() {
   $NAME --version | cut -d " " -f 2
 }
 
-
-install_rroonga() {
-  # Install Rroonga globally from a public gem, because custom build
-  # doesn't work as we expect for Droonga...
-  if exist_command grndump; then
-    local current_version=$(grndump -v | cut -d " " -f 2)
-    local version_matcher=$(cat $NAME.gemspec | \
-                            grep rroonga | \
-                            cut -d "," -f 2 | \
-                            cut -d '"' -f 2)
-    local compared_version=$(echo "$version_matcher" | \
-                             cut -d " " -f 2)
-    local operator=$(echo "$version_matcher" | cut -d " " -f 1)
-    local compare_result=$(ruby -e "puts('$current_version' $operator '$compared_version')")
-    if [ "$compare_result" = "true" ]; then return 0; fi
-  fi
-  gem install rroonga --no-ri --no-rdoc
-}
-
-install_master() {
-  gem install bundler --no-ri --no-rdoc
-
+install_gem_from_repository() {
+  GEM_NAME=$1
+  GEM_REPOSITORY_URL=$2
   cd $TEMPDIR
 
-  if [ -d $NAME ]
+  if [ -d $GEM_NAME ]
   then
-    cd $NAME
-    install_rroonga
+    cd $GEM_NAME
     git reset --hard
     git pull --rebase
+    git checkout master
     bundle update
   else
-    git clone $REPOSITORY_URL
-    cd $NAME
-    install_rroonga
-    bundle install
+    git clone $GEM_REPOSITORY_URL
+    cd $GEM_NAME
+    git checkout master
+    bundle install --path vendor/
   fi
   rm -rf pkg
   bundle exec rake build
   gem install "pkg/*.gem" --no-ri --no-rdoc
 }
 
+install_from_repository() {
+  gem install bundler --no-ri --no-rdoc
+
+  if echo "$INSTALL_FROM_REPOSITORY" | grep "rroonga"
+  then
+    install_gem_from_repository rroonga $RROONGA_REPOSITORY_URL
+    install_gem_from_repository groonga-command $GROONGA_COMMAND_REPOSITORY_URL
+    install_gem_from_repository groonga-command-parser $GROONGA_COMMAND_PARSER_REPOSITORY_URL
+  else
+    rm -rf $TEMPDIR/rroonga
+    rm -rf $TEMPDIR/groonga-command
+    rm -rf $TEMPDIR/groonga-command-parser
+  fi
+
+  if echo "$INSTALL_FROM_REPOSITORY" | grep "client"
+  then
+    install_gem_from_repository droonga-client-ruby $DROONGA_CLIENT_RUBY_REPOSITORY_URL
+  else
+    rm -rf $TEMPDIR/droonga-client-ruby
+  fi
+
+
+  if echo "$INSTALL_FROM_REPOSITORY" | grep "drndump"
+  then
+    install_gem_from_repository drndump $DRNDUMP_REPOSITORY_URL
+  else
+    rm -rf $TEMPDIR/drndump
+  fi
+
+  install_gem_from_repository $NAME $REPOSITORY_URL
+}
+
 
 
 # ====================== for Debian/Ubuntu ==========================
@@ -262,7 +281,7 @@ prepare_environment_in_debian() {
     apt-get install -y libgroonga-dev
   fi
 
-  if [ "$VERSION" = "master" ]; then
+  if [ "$VERSION" != "release" ]; then
     apt-get install -y git
   fi
 }
@@ -297,7 +316,7 @@ prepare_environment_in_centos() {
     yum -y --enablerepo=groonga install groonga-devel
   fi
 
-  if [ "$VERSION" = "master" ]; then
+  if [ "$VERSION" != "release" ]; then
     yum -y install git
   fi
 }
@@ -312,9 +331,9 @@ install() {
   prepare_environment_in_$PLATFORM
 
   echo ""
-  if [ "$VERSION" = "master" ]; then
+  if [ "$VERSION" != "release" ]; then
     echo "Installing $NAME from the git repository..."
-    install_master
+    install_from_repository
   else
     echo "Installing $NAME from RubyGems..."
     gem install droonga-engine --no-rdoc --no-ri
@@ -325,7 +344,7 @@ install() {
     exit 1
   fi
 
-  curl -o $TEMPDIR/functions.sh $(download_url "install/$PLATFORM/functions.sh")
+  curl -s -o $TEMPDIR/functions.sh $(download_url "install/$PLATFORM/functions.sh")
   if ! source $TEMPDIR/functions.sh; then
     echo "ERROR: Failed to download post-installation script!"
     exit 1