elasticsearch-drain 0.1.8 → 0.1.9
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 +4 -4
- data/lib/elasticsearch/drain/cli.rb +2 -12
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 833e9ccb66eeabd7ec9e3ed2f193ec2dc389de6d
|
|
4
|
+
data.tar.gz: 42edac2e4d75dc0254b996dea328a8188a5c0d6e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0a5e9b266c549472492101d76961441a46bd023868649ca640ba069bae82a36902c4cfb3d6b12b6a168f4f8a0c851ca8c1dbfdc1051d67c1bc408f3f550722d6
|
|
7
|
+
data.tar.gz: ba5815bfa7eba8f2b86af97072d9e4f89add797d39f4116ec22aaa1bfefe0067663a699f5dc542c544d9ab5d24dc592c65a57e57f52b0576d1915566ca7b10f8
|
|
@@ -76,17 +76,10 @@ module Elasticsearch
|
|
|
76
76
|
@active_nodes = nodes unless options[:continue]
|
|
77
77
|
|
|
78
78
|
drain_nodes(nodes)
|
|
79
|
-
|
|
79
|
+
remove_nodes(nodes)
|
|
80
80
|
|
|
81
81
|
# Remove the drained nodes from the list of active_nodes
|
|
82
|
-
|
|
83
|
-
say_status "pre-subtract", "active_nodes=#{active_nodes}", "green"
|
|
84
|
-
|
|
85
|
-
deleted_nodes.each do |deleted_node|
|
|
86
|
-
@active_nodes.delete_if { |n| n.ipaddress == deleted_node.ipaddress }
|
|
87
|
-
end
|
|
88
|
-
|
|
89
|
-
say_status "post-subtract", "active_nodes=#{active_nodes}", "green"
|
|
82
|
+
@active_nodes -= nodes
|
|
90
83
|
|
|
91
84
|
unless active_nodes.empty?
|
|
92
85
|
say_status 'Drain Nodes', "#{active_nodes.length} nodes remaining", :green
|
|
@@ -149,7 +142,6 @@ module Elasticsearch
|
|
|
149
142
|
end
|
|
150
143
|
|
|
151
144
|
def remove_nodes(nodes) # rubocop:disable Metrics/MethodLength
|
|
152
|
-
deleted_nodes = []
|
|
153
145
|
while nodes.length > 0
|
|
154
146
|
sleep_time = wait_sleep_time
|
|
155
147
|
nodes.each do |instance|
|
|
@@ -159,7 +151,6 @@ module Elasticsearch
|
|
|
159
151
|
sleep sleep_time
|
|
160
152
|
else
|
|
161
153
|
next unless remove_node(instance)
|
|
162
|
-
deleted_nodes.push(nodes.select { |n| n.ipaddress == instance.ipaddress })
|
|
163
154
|
nodes.delete_if { |n| n.ipaddress == instance.ipaddress }
|
|
164
155
|
break if nodes.length < 1
|
|
165
156
|
say_status 'Waiting', 'Sleeping for 1 minute before removing the next node', :green
|
|
@@ -167,7 +158,6 @@ module Elasticsearch
|
|
|
167
158
|
end
|
|
168
159
|
end
|
|
169
160
|
end
|
|
170
|
-
deleted_nodes
|
|
171
161
|
end
|
|
172
162
|
|
|
173
163
|
def remove_node(instance) # rubocop:disable Metrics/MethodLength
|