elasticsearch-drain 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57f2263aa275c59fbda6c32bb057717d8a096bf0
-  data.tar.gz: 88cb776d2905e4fd9d6c104c4425cc5b775a6d5b
+  metadata.gz: 5636da7177de03b2cc46e1f5f9c3382c542c25b1
+  data.tar.gz: ae9b51d1c2ace5e83497a6a92ba956523d713e01
 SHA512:
-  metadata.gz: 65ede075fec1ff5d976692bbf8ad3ae617976d47f9b9e73df9e4eb535f91c5da78a9fcb194556c5aafcc40192b2bf20ea5f7039990d1baa7cb9eb1031b01d987
-  data.tar.gz: 43b1ed542429a2b52e54e06e5e8cd88b9ee7a2f6f2d5deccc7118ead87a20d6a11f84a3b76ee560ebbdd08ffb4ffc2743a91f1b3dba542b41460baa9cd768183
+  metadata.gz: 7bbe3a3434ff69a13826251cb29561a6d95431294a7bc8590883480edbba598ff206c4d17d048a17a053e95fae4fb53f19ddf624599bf334215fa0b79ab34c1b
+  data.tar.gz: dfec04ba5e72334f4d75a597b512230f93670374d22afcbfc92f4b6e3a0683a2cf191394dba4072b84c68fefdf25f1def1417984d5a44f1f4d6a2616142ec346

data/Gemfile.lock

@@ -14,12 +14,12 @@ GEM
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
-    aws-sdk (2.2.1)
-      aws-sdk-resources (= 2.2.1)
-    aws-sdk-core (2.2.1)
+    aws-sdk (2.4.4)
+      aws-sdk-resources (= 2.4.4)
+    aws-sdk-core (2.4.4)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.1)
-      aws-sdk-core (= 2.2.1)
+    aws-sdk-resources (2.4.4)
+      aws-sdk-core (= 2.4.4)
     coderay (1.1.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -53,7 +53,7 @@ GEM
       guard-compat (~> 1.2)
       minitest (>= 3.0)
     hashdiff (0.2.2)
-    jmespath (1.1.3)
+    jmespath (1.3.1)
     json (1.8.3)
     listen (3.0.3)
       rb-fsevent (>= 0.9.3)
@@ -62,7 +62,7 @@ GEM
     method_source (0.8.2)
     minitest (5.8.1)
     mixlib-shellout (2.2.3)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     nenv (0.2.0)
     notiffany (0.0.8)

data/lib/elasticsearch/drain.rb

@@ -40,7 +40,7 @@ module Elasticsearch
 
     # Convience method to access {Elasticsearch::Drain::Nodes}
     def nodes
-      Nodes.new(client, asg)
+      @nodes ||= Nodes.new(client, asg)
     end
 
     # Convience method to access {Elasticsearch::Drain::Cluster#cluster}
@@ -52,7 +52,7 @@ module Elasticsearch
 
     def active_nodes_in_asg
       instances = asg.instances
-      nodes.nodes_in_asg(reload: true, instances: instances)
+      nodes.filter_nodes(instances, true)
     end
 
     module Errors

data/lib/elasticsearch/drain/cli.rb

@@ -12,12 +12,20 @@ module Elasticsearch
       option :host, default: 'localhost:9200'
       option :asg, required: true
       option :region, required: true
+      option :nodes
       def asg # rubocop:disable Metrics/MethodLength
         @drainer = Elasticsearch::Drain.new(options[:host],
                                             options[:asg],
                                             options[:region])
         ensure_cluster_healthy
         @active_nodes = drainer.active_nodes_in_asg
+
+        # If a node or nodes are specified, only drain the requested node(s)
+        @active_nodes = active_nodes.find_all do |n|
+          instance_id = drainer.asg.instance(n.ipaddress).instance_id
+          options[:nodes].split(',').include?(instance_id)
+        end if options[:nodes]
+
         do_exit { say_status 'Complete', 'Nothing to do', :green } if active_nodes.empty?
         say_status 'Found Nodes', "AutoScalingGroup: #{instances}", :magenta
         ensure_cluster_healthy
@@ -45,8 +53,21 @@ module Elasticsearch
           instances.join(' ')
         end
 
+        def adjusted_min_size
+          min_size = drainer.asg.min_size
+          desired_capacity = drainer.asg.desired_capacity
+          if (desired_capacity - active_nodes.length) >= min_size # Removing the active_nodes won't violate the min_size
+            # Reduce the asg min_size proportionally
+            desired_min_size = (min_size - active_nodes.length) <= 0 ? 0 : (min_size - active_nodes.length)
+          else
+            # Removing the active_nodes will result in the min_size being violated
+            desired_min_size = desired_capacity - active_nodes.length
+          end
+          desired_min_size
+        end
+
         def drain_nodes
-          drainer.asg.min_size = 0
+          drainer.asg.min_size = adjusted_min_size
           nodes_to_drain = active_nodes.map(&:id).join(',')
           say_status 'Drain Nodes', "Draining nodes: #{nodes_to_drain}", :magenta
           drainer.cluster.drain_nodes(nodes_to_drain, '_id')
@@ -55,13 +76,13 @@ module Elasticsearch
         def remove_nodes # rubocop:disable Metrics/MethodLength
           while active_nodes.length > 0
             active_nodes.each do |instance|
-              self.active_nodes = drainer.active_nodes_in_asg
+              instance = drainer.nodes.filter_nodes([instance], true).first
               if instance.bytes_stored > 0
                 say_status 'Drain Status', "Node #{instance.ipaddress} has #{instance.bytes_stored} bytes to move", :blue
                 sleep 2
               else
                 next unless remove_node(instance)
-                self.active_nodes = drainer.active_nodes_in_asg
+                active_nodes.delete_if { |n| n.ipaddress == instance.ipaddress }
                 break if active_nodes.length < 1
                 say_status 'Waiting', 'Sleeping for 1 minute before removing the next node', :green
                 sleep 60

data/lib/elasticsearch/drain/nodes.rb

@@ -26,7 +26,7 @@ module Elasticsearch
       # Get list of nodes in the cluster
       #
       # @return [Array<OpenStruct>] Array of node objects
-      def nodes(reload: false)
+      def nodes(reload = false)
         load if reload
         @info['nodes'].map do |node|
           Drain::Node.new(
@@ -38,8 +38,8 @@ module Elasticsearch
         end
       end
 
-      def nodes_in_asg(reload: false, instances:)
-        nodes(reload: false).find_all { |n| instances.include? n.ipaddress }
+      def filter_nodes(instances, reload = false)
+        nodes(reload).find_all { |n| instances.include? n.ipaddress }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-drain
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andrew Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler