RubyGems - elasticsearch-extensions - Versions diffs - 0.0.18 → 0.0.19 - Mend

elasticsearch-extensions 0.0.18 → 0.0.19

Files changed (5) hide show

checksums.yaml +4 -4
data/README.md +19 -17
data/lib/elasticsearch/extensions/test/cluster.rb +72 -34
data/lib/elasticsearch/extensions/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e107c0460b65ea557da0d707c1d04876e5c09148
-  data.tar.gz: 24c97d1fb54ceddc82bfb832ba8e4e7b4f53107f
+  metadata.gz: 8b6250368c4ae4b601347a41c4af300c9c539b71
+  data.tar.gz: 809f7bc9ed9ddf45c3dffda512a5c9fe4a2c8a0f
 SHA512:
-  metadata.gz: 111ae93ac52d93ad54240d735a0d8373d075d25fb3769c830be10024f422a5b9fb803f033e1f9bb03e58cd660678f9fda44f7c6d97b404a493a44216871dd3bc
-  data.tar.gz: 6912205e7419ed78da8520fe15138cea7c4b759209bdc047fcde678b724e78e0d61c4d3de910a5d093f440f04c68dc17b7beae44a7b3e4d349a32e08bc2b262a
+  metadata.gz: ecb428c94a77ad8578141d5b2d8a4806942e900958539999b9d3bae21549eba985296f1869a7652a6a4ca9293a27b06c4f20810d1568e97a3f2e1314aa3f31b5
+  data.tar.gz: 1ea390d043992f5ee8346d9bb1a78b1f4a527e54a7f0d076cffc22d7161005128c959384fee8126ce32d4b5a676e7d4475de5c47394fa494911ceac2a6b3ab23

data/README.md CHANGED Viewed

@@ -3,6 +3,24 @@
 This library provides a set of extensions to the
 [`elasticsearch`](https://github.com/elasticsearch/elasticsearch-ruby) Rubygem.
+## Installation
+Install the package from [Rubygems](https://rubygems.org):
+    gem install elasticsearch-extensions
+To use an unreleased version, either add it to your `Gemfile` for [Bundler](http://gembundler.com):
+    gem 'elasticsearch-extensions', git: 'git://github.com/elasticsearch/elasticsearch-ruby.git'
+or install it from a source code checkout:
+    git clone https://github.com/elasticsearch/elasticsearch-ruby.git
+    cd elasticsearch-ruby/elasticsearch-extensions
+    bundle install
+    rake install
 ## Extensions
 ### ANSI
@@ -69,6 +87,7 @@ You can control the cluster configuration with environment variables as well:
     TEST_CLUSTER_COMMAND=/usr/local/Cellar/elasticsearch/0.90.10/bin/elasticsearch \
     TEST_CLUSTER_PORT=9350 \
     TEST_CLUSTER_NODES=3 \
+    TEST_CLUSTER_NAME=my_testing_cluster \
     ruby -r elasticsearch -e "require 'elasticsearch/extensions/test/cluster'; Elasticsearch::Extensions::Test::Cluster.start"
 [Full documentation](http://rubydoc.info/gems/elasticsearch-extensions/Elasticsearch/Extensions/Test/Cluster)
@@ -144,23 +163,6 @@ When omitted, the full code profile by [RubyProf](https://github.com/ruby-prof/r
 [Example in the Elasticsearch gem](https://github.com/elasticsearch/elasticsearch-ruby/blob/master/elasticsearch-transport/test/profile/client_benchmark_test.rb)
-## Installation
-Install the package from [Rubygems](https://rubygems.org):
-    gem install elasticsearch-extensions
-To use an unreleased version, either add it to your `Gemfile` for [Bundler](http://gembundler.com):
-    gem 'elasticsearch-extensions', git: 'git://github.com/elasticsearch/elasticsearch-ruby.git'
-or install it from a source code checkout:
-    git clone https://github.com/elasticsearch/elasticsearch-ruby.git
-    cd elasticsearch-ruby/elasticsearch-extensions
-    bundle install
-    rake install
 ## Development
 To work on the code, clone and bootstrap the main repository first --

data/lib/elasticsearch/extensions/test/cluster.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 require 'timeout'
 require 'net/http'
 require 'fileutils'
+require 'socket'
 require 'uri'
 require 'json'
 require 'ansi'
@@ -31,7 +32,9 @@ module Elasticsearch
       # @see Cluster#stop Cluster.stop
       #
       module Cluster
+        @@network_host    = ENV.fetch('TEST_CLUSTER_NETWORK_HOST', 'localhost')
         @@number_of_nodes = (ENV['TEST_CLUSTER_NODES'] || 2).to_i
+        @@default_cluster_name = "elasticsearch-test-#{Socket.gethostname.downcase}"
         # Starts a cluster
         #
@@ -40,11 +43,18 @@ module Elasticsearch
         #
         # Use the {Cluster#stop Cluster.stop} command with the same arguments to stop this cluster.
         #
-        # @option arguments [String]  :command      Elasticsearch command (default: `elasticsearch`).
-        # @option arguments [Integer] :nodes        Number of desired nodes (default: 2).
-        # @option arguments [String]  :cluster_name Cluster name (default: `elasticsearch_test`).
-        # @option arguments [String]  :port         Starting port number; will be auto-incremented (default: 9250).
-        # @option arguments [Integer] :timeout      Timeout when starting the cluster (default: 30).
+        # @option arguments [String]  :cluster_name Cluster name (default: `elasticsearch_test`)
+        # @option arguments [Integer] :nodes        Number of desired nodes (default: 2)
+        # @option arguments [String]  :command      Elasticsearch command (default: `elasticsearch`)
+        # @option arguments [String]  :port         Starting port number; will be auto-incremented (default: 9250)
+        # @option arguments [String]  :node_name    The node name (will be appended with a number)
+        # @option arguments [String]  :path_data    Path to the directory to store data in
+        # @option arguments [String]  :path_work    Path to the directory with auxiliary files
+        # @option arguments [String]  :path_logs    Path to the directory with log files
+        # @option arguments [Boolean] :multicast_enabled Whether multicast is enabled (default: true)
+        # @option arguments [Integer] :timeout      Timeout when starting the cluster (default: 30)
+        # @option arguments [String]  :network_host The host that nodes will bind on and publish to
+        # @option arguments [Boolean] :clear        Wipe out cluster content on startup (default: true)
         #
         # You can also use environment variables to set these options.
         #
@@ -66,16 +76,20 @@ module Elasticsearch
         # @see Cluster#stop Cluster.stop
         #
         def start(arguments={})
-          @@number_of_nodes = (ENV['TEST_CLUSTER_NODES'] || arguments[:nodes] || 2).to_i
-          arguments[:command]      ||= ENV['TEST_CLUSTER_COMMAND'] || 'elasticsearch'
-          arguments[:port]         ||= (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
-          arguments[:cluster_name] ||= (ENV['TEST_CLUSTER_NAME'] || 'elasticsearch_test').chomp
-          arguments[:path_data]    ||= ENV['TEST_CLUSTER_DATA'] || '/tmp'
-          arguments[:es_params]    ||= ENV['TEST_CLUSTER_PARAMS'] || ''
-          arguments[:path_work]    ||= '/tmp'
-          arguments[:node_name]    ||= 'node'
-          arguments[:timeout]      ||= (ENV['TEST_CLUSTER_TIMEOUT'] || 30).to_i
+          @@number_of_nodes = ( ENV.fetch('TEST_CLUSTER_NODES', arguments[:nodes] || 2) ).to_i
+          arguments[:command]           ||= ENV.fetch('TEST_CLUSTER_COMMAND',   'elasticsearch')
+          arguments[:port]              ||= (ENV.fetch('TEST_CLUSTER_PORT',     9250).to_i)
+          arguments[:cluster_name]      ||= (ENV.fetch('TEST_CLUSTER_NAME',     @@default_cluster_name).chomp)
+          arguments[:node_name]         ||= ENV.fetch('TEST_CLUSTER_NODE_NAME', 'node')
+          arguments[:path_data]         ||= ENV.fetch('TEST_CLUSTER_DATA',      '/tmp/elasticsearch_test')
+          arguments[:path_work]         ||= ENV.fetch('TEST_CLUSTER_TMP',       '/tmp')
+          arguments[:path_logs]         ||= ENV.fetch('TEST_CLUSTER_LOGS',      '/var/log/elasticsearch')
+          arguments[:es_params]         ||= ENV.fetch('TEST_CLUSTER_PARAMS',    '')
+          arguments[:multicast_enabled] ||= ENV.fetch('TEST_CLUSTER_MULTICAST', 'true')
+          arguments[:timeout]           ||= (ENV.fetch('TEST_CLUSTER_TIMEOUT', 30).to_i)
+          arguments[:network_host]      ||= @@network_host
+          arguments[:clear]             ||= true
           # Make sure `cluster_name` is not dangerous
           if arguments[:cluster_name] =~ /^[\/\\]?$/
@@ -88,8 +102,8 @@ module Elasticsearch
             return false
           end
-          # Wipe out data for this cluster name
-          FileUtils.rm_rf "#{arguments[:path_data]}/#{arguments[:cluster_name]}"
+          # Wipe out data for this cluster name if requested
+          FileUtils.rm_rf "#{arguments[:path_data]}/#{arguments[:cluster_name]}" if arguments[:clear]
           print "Starting ".ansi(:faint) +
                 @@number_of_nodes.to_s.ansi(:bold, :faint) +
@@ -99,7 +113,7 @@ module Elasticsearch
           @@number_of_nodes.times do |n|
             n += 1
-            pid = Process.spawn <<-COMMAND
+            command = <<-COMMAND
               #{arguments[:command]} \
                 -D es.foreground=yes \
                 -D es.cluster.name=#{arguments[:cluster_name]} \
@@ -107,16 +121,24 @@ module Elasticsearch
                 -D es.http.port=#{arguments[:port].to_i + (n-1)} \
                 -D es.path.data=#{arguments[:path_data]} \
                 -D es.path.work=#{arguments[:path_work]} \
+                -D es.path.logs=#{arguments[:path_logs]} \
                 -D es.cluster.routing.allocation.disk.threshold_enabled=false \
-                -D es.network.host=0.0.0.0 \
-                -D es.discovery.zen.ping.multicast.enabled=true \
-                -D es.script.disable_dynamic=false \
+                -D es.network.host=#{@@network_host} \
+                -D es.discovery.zen.ping.multicast.enabled=#{arguments[:multicast_enabled]} \
+                -D es.script.inline=on \
+                -D es.script.indexed=on \
                 -D es.node.test=true \
+                -D es.node.testattr=test \
                 -D es.node.bench=true \
+                -D es.path.repo=/tmp \
+                -D es.repositories.url.allowed_urls=http://snapshot.test* \
                 -D es.logger.level=DEBUG \
                 #{arguments[:es_params]} \
                 > /dev/null
             COMMAND
+            STDERR.puts command.gsub(/ {1,}/, ' ') if ENV['DEBUG']
+            pid = Process.spawn(command)
             Process.detach pid
             pids << pid
           end
@@ -146,9 +168,10 @@ module Elasticsearch
         #
         def stop(arguments={})
           arguments[:port] ||= (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
+          arguments[:network_host] ||= ENV.fetch('TEST_CLUSTER_NETWORK_HOST', @@network_host)
           nodes = begin
-            JSON.parse(Net::HTTP.get(URI("http://localhost:#{arguments[:port]}/_nodes/?process")))
+            JSON.parse(Net::HTTP.get(URI("http://#{arguments[:network_host]}:#{arguments[:port]}/_nodes/?process")))
           rescue Exception => e
             STDERR.puts "[!] Exception raised when stopping the cluster: #{e.inspect}".ansi(:red)
             nil
@@ -161,10 +184,25 @@ module Elasticsearch
           unless pids.empty?
             print "\nStopping Elasticsearch nodes... ".ansi(:faint)
             pids.each_with_index do |pid, i|
-              begin
-                print "stopped PID #{pid}. ".ansi(:green) if Process.kill 'INT', pid
-              rescue Exception => e
-                print "[#{e.class}] PID #{pid} not found. ".ansi(:red)
+              ['INT','KILL'].each do |signal|
+                begin
+                  Process.kill signal, pid
+                rescue Exception => e
+                  print "[#{e.class}] PID #{pid} not found. ".ansi(:red)
+                end
+                # Give the system some breathing space to finish...
+                sleep 1
+                # Check that pid really is dead
+                begin
+                  Process.getpgid( pid )
+                  # `getpgid` will raise error if pid is dead, so if we get here, try next signal.
+                  next
+                rescue Errno::ESRCH
+                  print "stopped PID #{pid} with #{signal} signal. ".ansi(:green)
+                  break # pid is dead
+                end
               end
             end
             puts
@@ -184,7 +222,7 @@ module Elasticsearch
         #
         def running?(arguments={})
           port         = arguments[:on] || (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
-          cluster_name = arguments[:as] ||  ENV['TEST_CLUSTER_NAME'] || 'elasticsearch_test'
+          cluster_name = arguments[:as] || (ENV.fetch('TEST_CLUSTER_NAME', @@default_cluster_name).chomp)
           if cluster_health = Timeout::timeout(0.25) { __get_cluster_health(port) } rescue nil
             return cluster_health['cluster_name']    == cluster_name && \
@@ -219,18 +257,18 @@ module Elasticsearch
         # @return Boolean
         #
         def __wait_for_status(status='green', port=9250, timeout=30)
-          uri = URI("http://localhost:#{port}/_cluster/health?wait_for_status=#{status}")
+          uri = URI("http://#{@@network_host}:#{port}/_cluster/health?wait_for_status=#{status}")
           Timeout::timeout(timeout) do
             loop do
               response = begin
                 JSON.parse(Net::HTTP.get(uri))
               rescue Exception => e
-                puts e.inspect if ENV['DEBUG']
+                STDERR.puts e.inspect if ENV['DEBUG']
                 nil
               end
-              puts response.inspect if ENV['DEBUG']
+              STDERR.puts response.inspect if response && ENV['DEBUG']
               if response && response['status'] == status && ( @@number_of_nodes.nil? || @@number_of_nodes == response['number_of_nodes'].to_i  )
                 __print_cluster_info(port) and break
@@ -249,9 +287,9 @@ module Elasticsearch
         # @api private
         #
         def __print_cluster_info(port)
-          health = JSON.parse(Net::HTTP.get(URI("http://localhost:#{port}/_cluster/health")))
-          nodes  = JSON.parse(Net::HTTP.get(URI("http://localhost:#{port}/_nodes/process,http")))
-          master = JSON.parse(Net::HTTP.get(URI("http://localhost:#{port}/_cluster/state")))['master_node']
+          health = JSON.parse(Net::HTTP.get(URI("http://#{@@network_host}:#{port}/_cluster/health")))
+          nodes  = JSON.parse(Net::HTTP.get(URI("http://#{@@network_host}:#{port}/_nodes/process,http")))
+          master = JSON.parse(Net::HTTP.get(URI("http://#{@@network_host}:#{port}/_cluster/state")))['master_node']
           puts "\n",
                 ('-'*80).ansi(:faint),
@@ -275,7 +313,7 @@ module Elasticsearch
         # @api private
         #
         def __get_cluster_health(port=9250)
-          uri = URI("http://localhost:#{port}/_cluster/health")
+          uri = URI("http://#{@@network_host}:#{port}/_cluster/health")
           if response = Net::HTTP.get(uri) rescue nil
             return JSON.parse(response)
           end

data/lib/elasticsearch/extensions/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Extensions
-    VERSION = "0.0.18"
+    VERSION = "0.0.19"
   end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-extensions
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Karel Minarik
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi