elasticsearch-manager 0.1.2 → 0.1.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663a444a1cd91b9cd92f1e0ac98244f2b7fb21a3
-  data.tar.gz: 9b2d5f1716c05bd61fed68a0ac22086924532eb9
+  metadata.gz: 6079bcc920e6439d8a9a559475286c95b10bbd01
+  data.tar.gz: fa08640b414124cfe481e31c5e53671766ff24b7
 SHA512:
-  metadata.gz: 1febf08eeceb2bc8de64f498aca26d5c29802ffad686da422c203da816304d71dccbbe328088b609b411b0e37ad421d1de9cad8ffa68c5b8511b854180cab0a7
-  data.tar.gz: 09d7e9f77f471e77fb7cbc2de7a5d48ec2c44c072c423dc1c6ddde5b71186f7421454702455e201634983230f589a02c6fa529510d279870f48c6cf752bbd6fe
+  metadata.gz: cf51c83135769abb3be98b2e1ad34a9a6823d3ffed8cbb4f49bb0f2ef0e441affcd1162b719964703c852265104d0f15da6185aa91323681feaeb300f362c1f8
+  data.tar.gz: 3515126e07ad11ad37bc7c8e9e3ae2e0e0573764265bda527877e41baa19d605c39ff0ccd0194a4d4610b62772cf35360acfd11abaa09688b1e31c45a6c2cfb8

data/Gemfile.lock

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

data/README.md

@@ -13,6 +13,26 @@ For a list of all supported actions, please run: `$ elasticsearch-manager --help
 gem install elasticsearch-manager
 ```
 
+## List IPs for all cluster members
+```
+$ elasticsearch-manager --cluster-hostname elasticsearch.example.com \
+                        --port 9200 status \
+                        list-nodes
+10.0.0.3 -- master
+10.0.0.1
+10.0.0.2
+```
+
+## Display the count of all shard states for each node in the cluster
+```
+$ elasticsearch-manager --cluster-hostname elasticsearch.example.com \
+                        --port 9200 status \
+                        shard-state
+10.0.0.1:   STARTED: 8       INITIALIZING: 0    RELOCATING: 0
+10.0.0.2:   STARTED: 8       INITIALIZING: 0    RELOCATING: 1
+10.0.0.3:   STARTED: 7       INITIALIZING: 1    RELOCATING: 0
+```
+
 ## Check the current status of a cluster
 
 ```
@@ -27,29 +47,53 @@ The Elasticsearch cluster is currently: green
 $ elasticsearch-manager --cluster-hostname elasticsearch.example.com \
                         --port 9200 status \
                         rolling-restart
-Discovering cluster members...
+Continue with rolling restart of cluster? (y/n) y
 
-Restarting Elasticsearch on node: 127.0.0.1
-Elasticsearch restarted on node: 127.0.0.1
+Restarting Elasticsearch on node: 10.0.0.1
+Elasticsearch restarted on node: 10.0.0.1
+Waiting for node to become available...
+Node back up!
 Waiting for cluster to stabilize...
 Waiting for cluster to stabilize...
 Cluster stabilized!
-Continue with rolling restart of cluster? (yes/no) yes
+Continue with rolling restart of cluster? (y/n) y
 
-Restarting Elasticsearch on node: 127.0.0.2
-Elasticsearch restarted on node: 127.0.0.2
+Restarting Elasticsearch on node: 10.0.0.2
+Elasticsearch restarted on node: 10.0.0.2
+Waiting for node to become available...
+Waiting for node to become available...
+Node back up!
 Waiting for cluster to stabilize...
 Waiting for cluster to stabilize...
 Waiting for cluster to stabilize...
 Waiting for cluster to stabilize...
 Cluster stabilized!
-Continue with rolling restart of cluster? (yes/no) yes
 
-Restarting current cluster master, continue? (yes/no) yes
+Restarting current cluster master, continue? (y/n) y
 
-Restarting Elasticsearch on node: 127.0.0.3
-Elasticsearch restarted on node: 127.0.0.3
+Restarting Elasticsearch on node: 10.0.0.3
+Elasticsearch restarted on node: 10.0.0.3
+Waiting for node to become available...
+Waiting for node to become available...
+Waiting for node to become available...
+Waiting for node to become available...
+Node back up!
 Waiting for cluster to stabilize...
 Cluster stabilized!
 ```
 
+## Disable routing allocation on the cluster
+```
+$ elasticsearch-manager --cluster-hostname elasticsearch.example.com \
+                        --port 9200 status \
+                        diable-routing
+Disabling shard routing allocation... disabled!
+```
+
+## Enable routing allocation on the cluster
+```
+$ elasticsearch-manager --cluster-hostname elasticsearch.example.com \
+                        --port 9200 status \
+                        enable-routing
+Enabling shard routing allocation... enabled!
+```

data/RELEASES.md

@@ -0,0 +1,27 @@
+# Releases
+
+## Current
+- Adding new options
+  + -y/--y, assume yes to all questions and do not prompt
+  + -s/--sleep, set sleep interval used between checks
+
+## v0.1.2
+- Added new actions
+  + list-nodes
+  + shard-state
+  + disable-routing
+  + enable-routing
+- Begun introducing flag to print verbose messaging
+- Now updating cluster-wide `node_concurrent_recoveries` setting equal
+  to the number of shards present on the node being restarted
+- Began raising Elasitcsearch::Manager::ApiError when API request exceptions occur
+
+## v0.1.1
+- Add required user confirmation between node restarts
+- Add parameterized sleep interval between stabilization checks
+- Guarantee the current master is restarted last
+- Add wait for node availability before re-enabling route allocation
+
+## v0.1.0
+- Initial release of elasticsearch manager
+- Supported rolling-restart of cluster and printing simple cluster status (green/yellow/red)

data/bin/elasticsearch-manager

@@ -17,13 +17,13 @@ options = {}
 opt_parser = OptionParser.new do |opts|
   opts.banner = <<EOC
 elasticsearch-manager [options] <command>
-  
+
 Available commands:
   rolling-restart    -- Restart elasticsearch across the entire cluster, one node at a time
   list-nodes         -- List IPs of nodes in the cluster
   shard-state        -- Print current shard states
   status             -- Check the current state of the cluster (green/yellow/red)
-  diable-routing     -- Disable shard routing allocation
+  disable-routing    -- Disable shard routing allocation
   enable-routing     -- Enable shard routing allocation
 
 EOC
@@ -39,14 +39,24 @@ EOC
   end
 
   options[:timeout] = 600
-  opts.on('-t TIMEOUT', '--timeout TIMEOUT', 'Timeout for waiting for cluster to stabilize during rolling-restart [default: 600]') do |p|
-    options[:port] = p
+  opts.on('-t TIMEOUT', '--timeout TIMEOUT', 'Timeout for waiting for cluster to stabilize during rolling-restart [default: 600]') do |t|
+    options[:port] = t
+  end
+
+  options[:sleep_interval] = 30
+  opts.on('-s SLEEP', '--sleep SLEEP', 'Sleep interval between cluster stabilize/node availability checks during rolling-restart [default: 30]') do |s|
+    options[:port] = s
   end
 
   options[:verbose] = false
   opts.on('-v', '--verbose', 'Print verbose messaging') do |v|
     options[:verbose] = v
   end
+
+  options[:assume_yes] = false
+  opts.on('-y', '--yes', 'Assume Yes to all queries and do not prompt') do |y|
+    options[:assume_yes] = y
+  end
 end
 
 opt_parser.parse!

data/lib/elasticsearch/manager/cmd.rb

@@ -31,9 +31,10 @@ module Elasticsearch
 
         timeout = opts[:timeout] || 600
         sleep_interval = opts[:sleep_interval] || 30
+        assume_yes = opts[:assume_yes].nil? ? false : opts[:assume_yes]
 
         begin
-          manager.rolling_restart(timeout, sleep_interval)
+          manager.rolling_restart(timeout, sleep_interval, assume_yes)
         rescue Elasticsearch::Manager::ApiError => e
           puts e
           return 3

data/lib/elasticsearch/manager/rollingrestart.rb

@@ -11,17 +11,17 @@ module Elasticsearch
   module Manager
 
     class ESManager
-      def rolling_restart(timeout = 600, sleep_interval = 30)
+      def rolling_restart(timeout = 600, sleep_interval = 30, assume_yes = false)
         highline = HighLine.new
         @members.each do |m|
           unless m == @leader
-            unless highline.agree('Continue with rolling restart of cluster? (y/n) ')
+            unless assume_yes || highline.agree('Continue with rolling restart of cluster? (y/n) ')
               raise UserRequestedStop, "Stopping rolling restart at user request!".colorize(:red)
             end
             restart_node(m, timeout, sleep_interval)
           end
         end
-        unless highline.agree("\nRestarting current cluster master, continue? (y/n) ")
+        unless assume_yes || highline.agree("\nRestarting current cluster master, continue? (y/n) ")
           raise UserRequestedStop, "Stopping rolling restart at user request before restarting master node!".colorize(:red)
         end
         restart_node(@leader, timeout, sleep_interval)
@@ -30,7 +30,7 @@ module Elasticsearch
       def restart_node(node_ip, timeout, sleep_interval)
           puts "\nRestarting Elasticsearch on node: #{node_ip}"
           # Pull the current node's state
-          n = @state.nodes.select { |n| n.ip == node_ip }[0]
+          n = @state.nodes.select { |i| i.ip == node_ip }[0]
 
           raise ClusterSettingsUpdateError, "Could not disable shard routing prior to restarting node: #{node_ip}".colorize(:red) unless disable_routing
 

data/lib/elasticsearch/manager/version.rb

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

data/spec/cmd_spec.rb

@@ -40,6 +40,27 @@ describe 'Elasticsearch::Manager::CMD' '#rolling_restart' do
       expect(exit_code).to eql(0)
     end
 
+    it 'does a clean restart with assume yes' do
+      expect(Net::SSH).to receive(:start).with('10.110.40.133', ENV['USER']).ordered
+      expect(Net::SSH).to receive(:start).with('10.110.33.218', ENV['USER']).ordered
+      expect(Net::SSH).to receive(:start).with('10.110.38.153', ENV['USER']).ordered
+
+      allow(ssh_connection).to receive(:exec) do |arg|
+        expect(arg).to eql('sudo service elasticsearch restart')
+      end
+      expect(ssh_connection).to receive(:exec).exactly(3).times
+
+      @input << ""
+      @input.rewind
+
+      exit_code = -1
+      output = capture_stdout do
+        opts = { :hostname => 'localhost', :port => '9200', :sleep_interval => 1, :assume_yes => true }
+        exit_code = CMD.rolling_restart(opts)
+      end
+      expect(exit_code).to eql(0)
+    end
+
     it 'throws stabilization timeout' do
       allow(ssh_connection).to receive(:exec) do |arg|
         expect(arg).to eql('sudo service elasticsearch restart')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3.pre
 platform: ruby
 authors:
 - Brian Oldfield
@@ -193,7 +193,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - README.md
-- REALEASES.md
+- RELEASES.md
 - bin/elasticsearch-manager
 - elasticsearch-manager.gemspec
 - lib/elasticsearch/client.rb
@@ -241,12 +241,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Basic managment utility for Elasticsearch
@@ -265,3 +265,4 @@ test_files:
 - spec/fixtures/state.json
 - spec/manager_spec.rb
 - spec/spec_helper.rb
+has_rdoc: