elasticsearch-drain 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb24a115da8d28e85b533eb08c0afdc413c33f2
-  data.tar.gz: ba7d9220e6b60125116b790ecde69a58b8af54ab
+  metadata.gz: f114c4a8198afa6bfeb2fcebaaab944fb3f5b9c1
+  data.tar.gz: a17e91b619ab4a8fe8454b6bd6aea7eb9faedc5c
 SHA512:
-  metadata.gz: cac2041857bbdf807a36c816326d5f4a973948d5556370268bda9a943d8b17e4e1d0de58310bbc3d4e1856ee92eeb9cdc94870062ad3e78c45f45b7a5aa4ab56
-  data.tar.gz: 546f9b783a91f4b3c82266281cd82cbcd1634f09208cd258688dca3ccf6ca87244f91dcb98774e92232ef2c91c4fe36873c7ff6acb30395b26587eb16a4abb9e
+  metadata.gz: c5e0af131d55bd7ce5e2ab2c0ce47783b2e03bcdb49fef91cb5f43bc74b7efb8aa57a87f019028c60f6c3463add5422d1089d648dd7d401685555c2a0054f942
+  data.tar.gz: 4e6b108edbcd6d66af32e78372dfc62bc3a33bc634fd4a5703678d3b3becb17e646cc2e2c15b24cb5aea9faff2dd5b6bc636f5f71cadabde8ec2d5e1813be7a8

data/lib/elasticsearch/drain/cli.rb

@@ -79,10 +79,9 @@ module Elasticsearch
           deleted_nodes = remove_nodes(nodes)
 
           # Remove the drained nodes from the list of active_nodes
-          say_status "deleted nodes", "deleted_nodes=#{deleted_nodes}", "green"
-          say_status "pre-subtract", "active_nodes=#{active_nodes}", "green"
-          @active_nodes -= deleted_nodes
-          say_status "post-subtract", "active_nodes=#{active_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
@@ -150,16 +149,18 @@ module Elasticsearch
             sleep_time = wait_sleep_time
             nodes.each do |instance|
               instance = drainer.nodes.filter_nodes([instance.ipaddress], true).first
-              if instance.bytes_stored > 0
-                say_status 'Drain Status', "Node #{instance.ipaddress} has #{instance.bytes_stored} bytes to move", :blue
-                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
-                sleep 60
+              unless instance.nil? || instance == 0
+                if instance.bytes_stored > 0
+                  say_status 'Drain Status', "Node #{instance.ipaddress} has #{instance.bytes_stored} bytes to move", :blue
+                  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
+                  sleep 60
+                end
               end
             end
           end

metadata

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