elasticsearch-drain 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4dcf3b1a2523d66426b22c71b20e66b7295c0e
-  data.tar.gz: 42c8caddc7a899c12be10fd14a8b0503c6634af2
+  metadata.gz: d6f8cdf47026cb2eb68de833e51f92ead6d2a0ad
+  data.tar.gz: db0f685a2028a42f597296ed89e6a5fb94a041da
 SHA512:
-  metadata.gz: 78d744d771d4fc44f3d40d426236b1a436674c16615f0e9247e48141c1dfc69281bc82fac3cb4fd7408e5b638577390afa89638648cd0a84f54bdafa28a7c711
-  data.tar.gz: 6ad66598a29d616cf756a74ac3e57a99c7a2c31e7b3cb248ce0777aea7d309a91d2986afe362e3a2897e10be34bc63d5e8c2b22bad12d0693368bd4ae84191c2
+  metadata.gz: edd8562747b105ee3a7f2b6379224ed72aea324702828f92690a740265fd495d2fd18e8ba1fa474ea31ad071270438d55166f7aff0d42ce1f287bcb09d8ebf5e
+  data.tar.gz: 2e02dab0dea20881a1d87a2b28ae539aedf845110dc416a51f8f50fc395601a5a41799e841c1ee4ba3dd310219d652f3044593070004fa3f6c072f20864d78ec

data/lib/elasticsearch/drain/cli.rb

@@ -76,12 +76,12 @@ 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
-          say_status "pre-subtract", "active_nodes=#{active_nodes}, nodes=#{nodes}", "green"
-          @active_nodes -= nodes
-          say_status "post-subtract", "active_nodes=#{active_nodes}, nodes=#{nodes}", "green"
+          deleted_nodes.each do |deleted_node|
+            active_nodes.delete_if { |n| n.id == deleted_node.id }
+	  end
 
           unless active_nodes.empty?
             say_status 'Drain Nodes', "#{active_nodes.length} nodes remaining", :green
@@ -144,6 +144,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|
@@ -153,6 +154,7 @@ module Elasticsearch
                 sleep sleep_time
               else
                 next unless remove_node(instance)
+                deleted_nodes.push(nodes.find { |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
@@ -160,6 +162,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.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Andrew Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler