elasticsearch-drain 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4dcf3b1a2523d66426b22c71b20e66b7295c0e
-  data.tar.gz: 42c8caddc7a899c12be10fd14a8b0503c6634af2
+  metadata.gz: c9c1dcd8e2979f4615c0d91ac2cadea04efd35d0
+  data.tar.gz: 2ed236883027d0f62c566d8a6456cc3be9798915
 SHA512:
-  metadata.gz: 78d744d771d4fc44f3d40d426236b1a436674c16615f0e9247e48141c1dfc69281bc82fac3cb4fd7408e5b638577390afa89638648cd0a84f54bdafa28a7c711
-  data.tar.gz: 6ad66598a29d616cf756a74ac3e57a99c7a2c31e7b3cb248ce0777aea7d309a91d2986afe362e3a2897e10be34bc63d5e8c2b22bad12d0693368bd4ae84191c2
+  metadata.gz: a1b9fd4deb9beef5dc1294d4844aa1e6fd8178ea29ba9a08eab1cc4f9a06627358bd5704356b2ce20327dcac51914924b5f450b01edbc50cff1381ea6d38d851
+  data.tar.gz: 89931bebc10cc5ad4e3b1270f8138e7bb1e72694b0b61c1fb3698f3974dbba03dd91e4857ebeec3a602479158cc80882c9e3009d9d5e5272a30e05bc2bffe1e9

data/lib/elasticsearch/drain/cli.rb

@@ -76,12 +76,13 @@ 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"
+          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"
 
           unless active_nodes.empty?
             say_status 'Drain Nodes', "#{active_nodes.length} nodes remaining", :green
@@ -144,6 +145,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 +155,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
@@ -160,6 +163,7 @@ module Elasticsearch
               end
             end
           end
+          deleted_nodes
         end
 
         def remove_node(instance) # rubocop:disable Metrics/MethodLength

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-drain
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrew Thompson