elasticsearch-drain 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f9122250f3be77882bb0ce4c14aa3de03eba351
-  data.tar.gz: ea15747daa99591d805e3582366e149e37e0f673
+  metadata.gz: f8ea42452ed3c9c4a2516200330ef800a9fa2007
+  data.tar.gz: cd16505372008cd84b97b59966c9b86b51549869
 SHA512:
-  metadata.gz: 017452105174c3c2c12a073b70580f61ada317653273a8951f89f310b8c51dccacf456b54dfe6554610879f6f5721995e58db26b69daa23fcff08eeb92bced30
-  data.tar.gz: 09e9cae06b18aa446a527e2612796af13b17d65549125a35e61717b13890e7b26ae76cc6a1f0cef7180cae50cd6b365ce5be625294ea2f0dd5f3dc11d6b918f6
+  metadata.gz: 841c98585ebdadf034e477efe7ed9778ff678e28550ac1c3a888269065583fea64edb0dc2d2f26f241bef717f76e4b9c87f211d877a7cc569e426872b69c6e87
+  data.tar.gz: 17a299d9f3697306fcfd80116ba4e26777c7cc3e8d6b54d6abc10d82bec3d4b43a6e01c263087aaee1a23e6730305b8308f9f37ba55262ad28a15fa7d1ce0d62

data/lib/elasticsearch/drain/cli.rb

@@ -76,10 +76,17 @@ module Elasticsearch
           @active_nodes = nodes unless options[:continue]
 
           drain_nodes(nodes)
-          remove_nodes(nodes)
+          deleted_nodes = remove_nodes(nodes)
 
           # Remove the drained nodes from the list of active_nodes
-          @active_nodes -= nodes
+          say_status "deleted nodes", "deleted_nodes=#{deleted_nodes}", "green"
+          say_status "pre-subtract", "active_nodes=#{active_nodes}", "green"
+
+          deleted_nodes.each do |deleted_node|
+            @active_nodes.delete_if { |n| n.ipaddress == deleted_node.ipaddress }
+          end 
+
+          say_status "post-subtract", "active_nodes=#{active_nodes}", "green"
 
           unless active_nodes.empty?
             say_status 'Drain Nodes', "#{active_nodes.length} nodes remaining", :green
@@ -119,9 +126,8 @@ module Elasticsearch
                                (min_size - nodes.length) <= 0 ? 0 : (min_size - nodes.length)
                              else
                                # Removing the nodes will result in the min_size being violated
-                               desired_capacity - nodes.length
+                               (desired_capacity - nodes.length) <= 0 ? 0 : (desired_capacity - nodes.length)
                              end
-          say_status 'Debug', "min_size = #{min_size}, desired_capacity = #{desired_capacity}, desired_min_size = #{desired_min_size}", :magenta
           desired_min_size
         end
 
@@ -143,6 +149,7 @@ module Elasticsearch
         end
 
         def remove_nodes(nodes) # rubocop:disable Metrics/MethodLength
+          deleted_nodes = []
           while nodes.length > 0
             sleep_time = wait_sleep_time
             nodes.each do |instance|
@@ -152,6 +159,7 @@ module Elasticsearch
                 sleep sleep_time
               else
                 next unless remove_node(instance)
+                deleted_nodes.push(nodes.select { |n| n.ipaddress == instance.ipaddress })
                 nodes.delete_if { |n| n.ipaddress == instance.ipaddress }
                 break if nodes.length < 1
                 say_status 'Waiting', 'Sleeping for 1 minute before removing the next node', :green
@@ -159,6 +167,7 @@ module Elasticsearch
               end
             end
           end
+          deleted_nodes
         end
 
         def remove_node(instance) # rubocop:disable Metrics/MethodLength

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-drain
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Andrew Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler