elasticsearch-drain 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb751f23604391d421be5540c9006217eb0d91b3
-  data.tar.gz: deb14051a07a1efd61162ff3f489c80c8513a54f
+  metadata.gz: c9c1dcd8e2979f4615c0d91ac2cadea04efd35d0
+  data.tar.gz: 2ed236883027d0f62c566d8a6456cc3be9798915
 SHA512:
-  metadata.gz: 3935ee1cabb06227d9f21375e90deabf10f7c552089c84ee014ef78a1527d8b3c5a65c17126696824f3cc21574c6fee9e178e6dc1da52326328a7ee43ac7b6c4
-  data.tar.gz: 263a73535b0908e021da6f4f4028efd1ac4e7fdb0c6f7be70e2ad2905c4a77ee511d09d9170f84bfb7d9ae0d1c9e5550f5026bd90641cd9986c965772edab166
+  metadata.gz: a1b9fd4deb9beef5dc1294d4844aa1e6fd8178ea29ba9a08eab1cc4f9a06627358bd5704356b2ce20327dcac51914924b5f450b01edbc50cff1381ea6d38d851
+  data.tar.gz: 89931bebc10cc5ad4e3b1270f8138e7bb1e72694b0b61c1fb3698f3974dbba03dd91e4857ebeec3a602479158cc80882c9e3009d9d5e5272a30e05bc2bffe1e9

data/lib/elasticsearch/drain/cli.rb

@@ -76,10 +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
-          @active_nodes -= 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"
 
           unless active_nodes.empty?
             say_status 'Drain Nodes', "#{active_nodes.length} nodes remaining", :green
@@ -119,9 +122,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 +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|
@@ -152,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
@@ -159,6 +163,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.1
+  version: 0.1.6
 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