elasticsearch-manager 0.1.2.pre.2 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7df641072ed25e81a1ec97cd9e33f77419ea7c48
-  data.tar.gz: 6ab6877ce6dd23693060dc0560ce40e16595404f
+  metadata.gz: 663a444a1cd91b9cd92f1e0ac98244f2b7fb21a3
+  data.tar.gz: 9b2d5f1716c05bd61fed68a0ac22086924532eb9
 SHA512:
-  metadata.gz: 5fef69122372459c338888afede7b611f2f2f5dfedc05f3cbe4d4e6c6fc428c7c7e521c96736d7e538361ac941361ffcb079dfb100f6fc0f59b32a02db56162d
-  data.tar.gz: ee67f4e9466b580294c58fa099282a96b1129da6776762ac612a12ed9b1db49c8760f8ff6ce6b9588c8e84403215cdeb64886fb3caa489c1cc4c7bda2261e6c0
+  metadata.gz: 1febf08eeceb2bc8de64f498aca26d5c29802ffad686da422c203da816304d71dccbbe328088b609b411b0e37ad421d1de9cad8ffa68c5b8511b854180cab0a7
+  data.tar.gz: 09d7e9f77f471e77fb7cbc2de7a5d48ec2c44c072c423dc1c6ddde5b71186f7421454702455e201634983230f589a02c6fa529510d279870f48c6cf752bbd6fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elasticsearch-manager (0.1.2.pre)
+    elasticsearch-manager (0.1.2.pre.2)
       colorize (~> 0.7)
       highline (~> 1.7)
       json (~> 1.8)

data/lib/elasticsearch/client/base.rb

@@ -1,5 +1,6 @@
 require 'logger'
 require 'rest-client'
+require 'elasticsearch/manager/errors'
 
 module Elasticsearch
   module Client
@@ -35,9 +36,7 @@ module Elasticsearch
         begin
           return RestClient.get url, opts
         rescue Exception => e
-          @logger.error(e.message)
-          raise e
-          raise IOError.new "Unable to complete get request: #{e}"
+          raise Elasticsearch::Manager::ApiError.new "Unable to complete get request: #{e}"
         end
       end
 
@@ -48,8 +47,7 @@ module Elasticsearch
         begin
           return RestClient.put url, body, opts
         rescue Exception => e
-          @logger.error(e.message)
-          raise IOError.new "Unable to complete put request: #{e}"
+          raise Elasticsearch::Manager::ApiError.new "Unable to complete put request: #{e}"
         end
       end
 

data/lib/elasticsearch/manager/cmd.rb

@@ -12,17 +12,31 @@ module Elasticsearch
       def self.rolling_restart(opts)
         manager = _manager(opts)
         # Check that the cluster is stable?
-        unless manager.cluster_stable?
-          print_cluster_status(manager, 'The cluster is currently unstable! Not proceeding with rolling-restart')
+        begin
+          unless manager.cluster_stable?
+            print_cluster_status(manager, 'The cluster is currently unstable! Not proceeding with rolling-restart')
+            return 2
+          end
+
+          print "Discovering cluster members..." if opts[:verbose]
+          manager.cluster_members!
+          print "\rDiscovering cluster members... Done!\n" if opts[:verbose]
+        rescue Elasticsearch::Manager::ApiError => e
+          puts e
+          return 3
+        rescue Exception => e
+          puts e
           return 2
         end
-        print "Discovering cluster members..." if opts[:verbose]
-        manager.cluster_members!
-        print "\rDiscovering cluster members... Done!\n" if opts[:verbose]
+
         timeout = opts[:timeout] || 600
         sleep_interval = opts[:sleep_interval] || 30
+
         begin
           manager.rolling_restart(timeout, sleep_interval)
+        rescue Elasticsearch::Manager::ApiError => e
+          puts e
+          return 3
         rescue Exception => e
           puts e
           return 2

data/lib/elasticsearch/manager/errors.rb

@@ -8,5 +8,11 @@ module Elasticsearch
 
     class UserRequestedStop < StandardError
     end
+
+    class ClusterSettingsUpdateError < StandardError
+    end
+
+    class ApiError < StandardError
+    end
   end
 end

data/lib/elasticsearch/manager/rollingrestart.rb

@@ -32,7 +32,8 @@ module Elasticsearch
           # Pull the current node's state
           n = @state.nodes.select { |n| n.ip == node_ip }[0]
 
-          raise "Could not disable shard routing prior to restarting node: #{node_ip}".colorize(:red) unless disable_routing
+          raise ClusterSettingsUpdateError, "Could not disable shard routing prior to restarting node: #{node_ip}".colorize(:red) unless disable_routing
+
           Net::SSH.start(node_ip, ENV['USER']) do |ssh|
             ssh.exec 'sudo service elasticsearch restart'
           end
@@ -47,9 +48,9 @@ module Elasticsearch
 
           # Make sure the cluster is willing to concurrently recover as many
           # shards per node as this node happens to have.
-          raise "Could not update node_concurrent_recoveries prior to restarting node: #{node_ip}".colorize(:red) unless set_concurrent_recoveries(n.count_started_shards + 1)
+          raise ClusterSettingsUpdateError, "Could not update node_concurrent_recoveries prior to restarting node: #{node_ip}".colorize(:red) unless set_concurrent_recoveries(n.count_started_shards + 1)
 
-          raise "Could not re-enable shard routing following restart of node: #{node_ip}".colorize(:red) unless enable_routing
+          raise ClusterSettingsUpdateError, "Could not re-enable shard routing following restart of node: #{node_ip}".colorize(:red) unless enable_routing
 
           begin
             wait_for_stable(timeout, sleep_interval)

data/lib/elasticsearch/manager/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Manager
-    VERSION = "0.1.2.pre.2"
+    VERSION = "0.1.2"
   end
 end

data/spec/cmd_spec.rb

@@ -119,5 +119,70 @@ describe 'Elasticsearch::Manager::CMD' '#rolling_restart' do
       end
       expect(exit_code).to eql(2)
     end
+
+    it 'throws settings update error when disabling routing' do
+      opts = {:hostname => 'localhost-disable-routing-error', :port => '9200'}
+
+      @input << "y\n"
+      @input.rewind
+
+      exit_code = -1
+      output = capture_stdout do
+        exit_code = CMD.rolling_restart(opts)
+      end
+      expect(exit_code).to eql(2)
+    end
+
+    it 'throws settings update error when updating recovery concurrency' do
+      opts = {:hostname => 'localhost-update-concurrent-error', :port => '9200'}
+
+      @input << "y\n"
+      @input.rewind
+
+      exit_code = -1
+      output = capture_stdout do
+        exit_code = CMD.rolling_restart(opts)
+      end
+      expect(exit_code).to eql(2)
+    end
+
+    it 'handles server errors on settings update' do
+      opts = {:hostname => 'localhost-error-settings', :port => '9200'}
+
+      @input << "y\n"
+      @input.rewind
+
+      exit_code = -1
+      output = capture_stdout do
+        exit_code = CMD.rolling_restart(opts)
+      end
+      expect(exit_code).to eql(3)
+    end
+
+    it 'handles server errors on state request' do
+      opts = {:hostname => 'localhost-error-state', :port => '9200'}
+
+      @input << "y\n"
+      @input.rewind
+
+      exit_code = -1
+      output = capture_stdout do
+        exit_code = CMD.rolling_restart(opts)
+      end
+      expect(exit_code).to eql(3)
+    end
+
+    it 'handles server errors on health request' do
+      opts = {:hostname => 'localhost-error-health', :port => '9200'}
+
+      @input << "y\n"
+      @input.rewind
+
+      exit_code = -1
+      output = capture_stdout do
+        exit_code = CMD.rolling_restart(opts)
+      end
+      expect(exit_code).to eql(3)
+    end
   end
 end

data/spec/manager_spec.rb

@@ -230,5 +230,52 @@ describe 'Elasticsearch::Manager::ESManager' 'routing' do
         expect { manager.rolling_restart(2, 1) }.to raise_error(Elasticsearch::Manager::UserRequestedStop)
       end
     end
+
+    it 'throws settings update error when disabling routing' do
+      manager = ESManager.new('localhost-disable-routing-error', 9200)
+      manager.cluster_members!
+      opts = {:hostname => 'localhost', :port => '9200'}
+
+      @input << "y\n"
+      @input.rewind
+
+      output = capture_stdout do
+        expect { manager.rolling_restart(2, 1) }.to raise_error(Elasticsearch::Manager::ClusterSettingsUpdateError)
+      end
+    end
+
+    it 'throws settings update error when updating recovery concurrency' do
+      manager = ESManager.new('localhost-update-concurrent-error', 9200)
+      manager.cluster_members!
+      opts = {:hostname => 'localhost', :port => '9200'}
+
+      @input << "y\n"
+      @input.rewind
+
+      output = capture_stdout do
+        expect { manager.rolling_restart(2, 1) }.to raise_error(Elasticsearch::Manager::ClusterSettingsUpdateError)
+      end
+    end
+
+    it 'handles server errors on settings update' do
+      manager = ESManager.new('localhost-error-settings', 9200)
+      manager.cluster_members!
+      opts = {:hostname => 'localhost', :port => '9200'}
+
+      @input << "y\n"
+      @input.rewind
+
+      output = capture_stdout do
+        expect { manager.rolling_restart(2, 1) }.to raise_error(Elasticsearch::Manager::ApiError)
+      end
+    end
+
+    it 'handles server errors on state request' do
+      manager = ESManager.new('localhost-error-state', 9200)
+
+      output = capture_stdout do
+        expect { manager.cluster_members! }.to raise_error(Elasticsearch::Manager::ApiError)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -22,12 +22,14 @@ require 'rack'
 WebMock.disable_net_connect!(allow_localhost: false)
 DIR = File.expand_path(File.dirname(__FILE__))
 
-class RestartTimeoutRack
-  def initialize(state_success_count = 10)
+class EsApiRack
+  def initialize(state_success_count = 10, concurrency_update_fail = false, routing_update_faile = false)
     @health_call_count = 0
     @state_call_count = 0
 
     @state_success_count = state_success_count
+    @concurrency_update_fail = concurrency_update_fail
+    @routing_update_faile = routing_update_faile
   end
 
   def call(env)
@@ -44,6 +46,17 @@ class RestartTimeoutRack
       inp = env['rack.input'].read
       at = inp[/\.([\w_]+)":/,1]
       val = inp[/allocation.*":["]?([^"]+)["]?}}/,1]
+      if @routing_update_faile
+        case val
+        when 'all'
+          val = 'none'
+        when 'none'
+          val = 'all'
+        end
+      elsif @concurrency_update_fail
+        val = '2'
+      end
+
       ret = "{\"transient\":{\"cluster\":{\"routing\":{\"allocation\":{\"#{at}\":\"#{val}\"}}}}}"
     when '/_cluster/state'
       if @state_call_count < @state_success_count
@@ -57,6 +70,34 @@ class RestartTimeoutRack
   end
 end
 
+class EsApiErrorRack < EsApiRack
+  def initialize(err_health = false, err_settings = false, err_state = false)
+    super(10, false, false)
+    @err_settings = err_settings
+    @err_health = err_health
+    @err_state = err_state
+  end
+
+  def call(env)
+    ret = super(env)
+    case env['PATH_INFO']
+    when '/_cluster/health'
+      if @err_health
+        ret = [500, ret[1], ret[2]]
+      end
+    when '/_cluster/settings'
+      if @err_settings
+        ret = [500, ret[1], ret[2]]
+      end
+    when '/_cluster/state'
+      if @err_state
+        ret = [500, ret[1], ret[2]]
+      end
+    end
+    ret
+  end
+end
+
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
@@ -190,22 +231,37 @@ RSpec.configure do |config|
                 headers: {'Content-Type' => 'application/json'})
 
     stub_request(:put, /localhost:9200\/_cluster\/settings/).
-      to_rack(RestartTimeoutRack.new(15))
+      to_rack(EsApiRack.new(15))
 
     stub_request(:any, /localhost-restart-timeout:9200\//).
-      to_rack(RestartTimeoutRack.new)
+      to_rack(EsApiRack.new)
     stub_request(:any, /localhost-cmd-restart-timeout:9200\//).
-      to_rack(RestartTimeoutRack.new)
+      to_rack(EsApiRack.new)
 
     stub_request(:any, /localhost-restart-stabilization:9200\//).
-      to_rack(RestartTimeoutRack.new)
+      to_rack(EsApiRack.new)
     stub_request(:any, /localhost-cmd-restart-stabilization:9200\//).
-      to_rack(RestartTimeoutRack.new)
+      to_rack(EsApiRack.new)
 
     stub_request(:any, /localhost-restart-not-available:9200\//).
-      to_rack(RestartTimeoutRack.new(2))
+      to_rack(EsApiRack.new(2))
     stub_request(:any, /localhost-cmd-restart-not-available:9200\//).
-      to_rack(RestartTimeoutRack.new(1))
+      to_rack(EsApiRack.new(1))
+
+    stub_request(:any, /localhost-disable-routing-error:9200\//).
+      to_rack(EsApiRack.new(2, false, true))
+
+    stub_request(:any, /localhost-update-concurrent-error:9200\//).
+      to_rack(EsApiRack.new(2, true, false))
+
+    stub_request(:any, /localhost-error-health:9200\//).
+      to_rack(EsApiErrorRack.new(true, false, false))
+
+    stub_request(:any, /localhost-error-settings:9200\//).
+      to_rack(EsApiErrorRack.new(false, true, false))
+
+    stub_request(:any, /localhost-error-state:9200\//).
+      to_rack(EsApiErrorRack.new(false, false, true))
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre.2
+  version: 0.1.2
 platform: ruby
 authors:
 - Brian Oldfield
@@ -241,9 +241,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6