elasticsearch-drain 0.1.6 → 0.1.11

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.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/elasticsearch/drain/cli.rb +15 -14
  3. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c9c1dcd8e2979f4615c0d91ac2cadea04efd35d0
4
- data.tar.gz: 2ed236883027d0f62c566d8a6456cc3be9798915
3
+ metadata.gz: e4d9818b7b31d2d314ed28f115e404ad13ae7aaf
4
+ data.tar.gz: 21b822e916ca22a8868aece44bbff7a3b121218c
5
5
  SHA512:
6
- metadata.gz: a1b9fd4deb9beef5dc1294d4844aa1e6fd8178ea29ba9a08eab1cc4f9a06627358bd5704356b2ce20327dcac51914924b5f450b01edbc50cff1381ea6d38d851
7
- data.tar.gz: 89931bebc10cc5ad4e3b1270f8138e7bb1e72694b0b61c1fb3698f3974dbba03dd91e4857ebeec3a602479158cc80882c9e3009d9d5e5272a30e05bc2bffe1e9
6
+ metadata.gz: 027619b731ea89f94141ec4e0d1ab170435039d4729bd2d907ffb48ee290b4b19d677eab634d9cebe00f5d1b78fb638852ab03efe9ed363213bcfb3be18580c9
7
+ data.tar.gz: 726c2ca1a5c00578f69f059837f8bf4a2e2139c18dbba889d2e898ca1f254e623607ad6a05bf8a4c79d21307270a3d777764b6dfca497c691ffa1f42908c3282
@@ -79,10 +79,9 @@ module Elasticsearch
79
79
  deleted_nodes = remove_nodes(nodes)
80
80
 
81
81
  # Remove the drained nodes from the list of active_nodes
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"
82
+ deleted_nodes.each do |deleted_node|
83
+ active_nodes.delete_if { |n| n.id == deleted_node.id }
84
+ end
86
85
 
87
86
  unless active_nodes.empty?
88
87
  say_status 'Drain Nodes', "#{active_nodes.length} nodes remaining", :green
@@ -150,16 +149,18 @@ module Elasticsearch
150
149
  sleep_time = wait_sleep_time
151
150
  nodes.each do |instance|
152
151
  instance = drainer.nodes.filter_nodes([instance.ipaddress], true).first
153
- if instance.bytes_stored > 0
154
- say_status 'Drain Status', "Node #{instance.ipaddress} has #{instance.bytes_stored} bytes to move", :blue
155
- sleep sleep_time
156
- else
157
- next unless remove_node(instance)
158
- deleted_nodes.push(nodes.select { |n| n.ipaddress == instance.ipaddress }
159
- nodes.delete_if { |n| n.ipaddress == instance.ipaddress }
160
- break if nodes.length < 1
161
- say_status 'Waiting', 'Sleeping for 1 minute before removing the next node', :green
162
- sleep 60
152
+ unless instance.nil? || instance == 0
153
+ if instance.bytes_stored > 0
154
+ say_status 'Drain Status', "Node #{instance.ipaddress} has #{instance.bytes_stored} bytes to move", :blue
155
+ sleep sleep_time
156
+ else
157
+ next unless remove_node(instance)
158
+ deleted_nodes.push(nodes.find { |n| n.ipaddress == instance.ipaddress })
159
+ nodes.delete_if { |n| n.ipaddress == instance.ipaddress }
160
+ break if nodes.length < 1
161
+ say_status 'Waiting', 'Sleeping for 1 minute before removing the next node', :green
162
+ sleep 60
163
+ end
163
164
  end
164
165
  end
165
166
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: elasticsearch-drain
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.1.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Thompson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-20 00:00:00.000000000 Z
11
+ date: 2020-09-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler