elasticsearch-drain 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9c1dcd8e2979f4615c0d91ac2cadea04efd35d0
-  data.tar.gz: 2ed236883027d0f62c566d8a6456cc3be9798915
+  metadata.gz: e4d9818b7b31d2d314ed28f115e404ad13ae7aaf
+  data.tar.gz: 21b822e916ca22a8868aece44bbff7a3b121218c
 SHA512:
-  metadata.gz: a1b9fd4deb9beef5dc1294d4844aa1e6fd8178ea29ba9a08eab1cc4f9a06627358bd5704356b2ce20327dcac51914924b5f450b01edbc50cff1381ea6d38d851
-  data.tar.gz: 89931bebc10cc5ad4e3b1270f8138e7bb1e72694b0b61c1fb3698f3974dbba03dd91e4857ebeec3a602479158cc80882c9e3009d9d5e5272a30e05bc2bffe1e9
+  metadata.gz: 027619b731ea89f94141ec4e0d1ab170435039d4729bd2d907ffb48ee290b4b19d677eab634d9cebe00f5d1b78fb638852ab03efe9ed363213bcfb3be18580c9
+  data.tar.gz: 726c2ca1a5c00578f69f059837f8bf4a2e2139c18dbba889d2e898ca1f254e623607ad6a05bf8a4c79d21307270a3d777764b6dfca497c691ffa1f42908c3282

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.6
+  version: 0.1.11
 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