elasticsearch-drain 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bd4dcf3b1a2523d66426b22c71b20e66b7295c0e
4
- data.tar.gz: 42c8caddc7a899c12be10fd14a8b0503c6634af2
3
+ metadata.gz: c9c1dcd8e2979f4615c0d91ac2cadea04efd35d0
4
+ data.tar.gz: 2ed236883027d0f62c566d8a6456cc3be9798915
5
5
  SHA512:
6
- metadata.gz: 78d744d771d4fc44f3d40d426236b1a436674c16615f0e9247e48141c1dfc69281bc82fac3cb4fd7408e5b638577390afa89638648cd0a84f54bdafa28a7c711
7
- data.tar.gz: 6ad66598a29d616cf756a74ac3e57a99c7a2c31e7b3cb248ce0777aea7d309a91d2986afe362e3a2897e10be34bc63d5e8c2b22bad12d0693368bd4ae84191c2
6
+ metadata.gz: a1b9fd4deb9beef5dc1294d4844aa1e6fd8178ea29ba9a08eab1cc4f9a06627358bd5704356b2ce20327dcac51914924b5f450b01edbc50cff1381ea6d38d851
7
+ data.tar.gz: 89931bebc10cc5ad4e3b1270f8138e7bb1e72694b0b61c1fb3698f3974dbba03dd91e4857ebeec3a602479158cc80882c9e3009d9d5e5272a30e05bc2bffe1e9
@@ -76,12 +76,13 @@ module Elasticsearch
76
76
  @active_nodes = nodes unless options[:continue]
77
77
 
78
78
  drain_nodes(nodes)
79
- remove_nodes(nodes)
79
+ deleted_nodes = remove_nodes(nodes)
80
80
 
81
81
  # Remove the drained nodes from the list of active_nodes
82
- say_status "pre-subtract", "active_nodes=#{active_nodes}, nodes=#{nodes}", "green"
83
- @active_nodes -= nodes
84
- say_status "post-subtract", "active_nodes=#{active_nodes}, nodes=#{nodes}", "green"
82
+ say_status "deleted nodes", "deleted_nodes=#{deleted_nodes}", "green"
83
+ say_status "pre-subtract", "active_nodes=#{active_nodes}", "green"
84
+ @active_nodes -= deleted_nodes
85
+ say_status "post-subtract", "active_nodes=#{active_nodes}", "green"
85
86
 
86
87
  unless active_nodes.empty?
87
88
  say_status 'Drain Nodes', "#{active_nodes.length} nodes remaining", :green
@@ -144,6 +145,7 @@ module Elasticsearch
144
145
  end
145
146
 
146
147
  def remove_nodes(nodes) # rubocop:disable Metrics/MethodLength
148
+ deleted_nodes = []
147
149
  while nodes.length > 0
148
150
  sleep_time = wait_sleep_time
149
151
  nodes.each do |instance|
@@ -153,6 +155,7 @@ module Elasticsearch
153
155
  sleep sleep_time
154
156
  else
155
157
  next unless remove_node(instance)
158
+ deleted_nodes.push(nodes.select { |n| n.ipaddress == instance.ipaddress }
156
159
  nodes.delete_if { |n| n.ipaddress == instance.ipaddress }
157
160
  break if nodes.length < 1
158
161
  say_status 'Waiting', 'Sleeping for 1 minute before removing the next node', :green
@@ -160,6 +163,7 @@ module Elasticsearch
160
163
  end
161
164
  end
162
165
  end
166
+ deleted_nodes
163
167
  end
164
168
 
165
169
  def remove_node(instance) # rubocop:disable Metrics/MethodLength
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: elasticsearch-drain
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Thompson