right_chimp 2.2.1 → 2.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGES +5 -0
- data/Gemfile.lock +1 -1
- data/lib/right_chimp/chimp.rb +4 -2
- data/lib/right_chimp/resources/task.rb +16 -14
- data/lib/right_chimp/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e7af2f093be4858573827cdf6ec385ddc54e1f06
|
4
|
+
data.tar.gz: 595742deb978554cf377a4725ddc47cef94f4eac
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9da4371d7ee3f666985c280ede3372f5a83b43c30af3f1df373077ed790a1b4c91dae15ae490818858c1aee118023c125f069ab7d887a53cb2001c067585600f
|
7
|
+
data.tar.gz: b080b64e7c69eaf648413e9a518951a66b2a711b7d8281ef696a965de4d388c365d374d22246fb1efb53023dd4f26587eb47d437d7148b5c55ebece30d902f33
|
data/CHANGES
CHANGED
data/Gemfile.lock
CHANGED
data/lib/right_chimp/chimp.rb
CHANGED
@@ -1059,7 +1059,7 @@ module Chimp
|
|
1059
1059
|
elsif command =~ /^r/i
|
1060
1060
|
puts "Retrying..."
|
1061
1061
|
ChimpQueue.instance.group[group].requeue_failed_jobs!
|
1062
|
-
return
|
1062
|
+
return 'retry'
|
1063
1063
|
end
|
1064
1064
|
end
|
1065
1065
|
end
|
@@ -1112,6 +1112,8 @@ module Chimp
|
|
1112
1112
|
|
1113
1113
|
if @interactive and @verify
|
1114
1114
|
done = verify_results(@group)
|
1115
|
+
# a retry means we are not done yet.
|
1116
|
+
done = false if done == 'retry'
|
1115
1117
|
else
|
1116
1118
|
done = true
|
1117
1119
|
end
|
@@ -1122,7 +1124,7 @@ module Chimp
|
|
1122
1124
|
exit 1 if failed_workers.size > 0
|
1123
1125
|
end
|
1124
1126
|
|
1125
|
-
puts
|
1127
|
+
puts 'chimp run complete'
|
1126
1128
|
end
|
1127
1129
|
|
1128
1130
|
#
|
@@ -6,45 +6,47 @@ module Chimp
|
|
6
6
|
# This class allows to check on the status of any of the tasks created.
|
7
7
|
#
|
8
8
|
class Task
|
9
|
-
|
10
9
|
attr_writer :tasker
|
11
10
|
attr_reader :tasker
|
12
11
|
|
13
|
-
def wait_for_state(desired_state, timeout=900)
|
14
|
-
while
|
15
|
-
|
16
|
-
|
12
|
+
def wait_for_state(desired_state, timeout = 900)
|
13
|
+
while timeout > 0
|
14
|
+
# Make compatible with RL10.
|
15
|
+
state = tasker.show.summary.downcase
|
16
|
+
return true if state.match(desired_state)
|
17
17
|
friendly_url = Connection.audit_url + '/audit_entries/'
|
18
|
-
friendly_url +=
|
18
|
+
friendly_url += href.split(/\//).last
|
19
19
|
friendly_url = friendly_url.gsub('ae-', '')
|
20
|
-
|
20
|
+
if state.match('failed') || state.match('aborted')
|
21
|
+
raise "FATAL error, #{tasker.show.summary}\n\n Audit: #{friendly_url}\n "
|
22
|
+
end
|
21
23
|
sleep 30
|
22
24
|
timeout -= 30
|
23
25
|
end
|
24
26
|
raise "FATAL: Timeout waiting for Executable to complete. State was #{self.state}" if timeout <= 0
|
25
27
|
end
|
26
28
|
|
27
|
-
def wait_for_completed(timeout=900)
|
29
|
+
def wait_for_completed(timeout = 900)
|
28
30
|
wait_for_state('completed', timeout)
|
29
31
|
end
|
30
32
|
|
31
33
|
def state
|
32
|
-
|
34
|
+
tasker.show.summary
|
33
35
|
end
|
34
36
|
|
35
37
|
def href
|
36
|
-
|
38
|
+
tasker.href
|
37
39
|
end
|
38
40
|
|
39
41
|
def friendly_url
|
40
|
-
friendly_url = Connection.audit_url+
|
41
|
-
friendly_url +=
|
42
|
-
friendly_url = friendly_url.gsub(
|
42
|
+
friendly_url = Connection.audit_url + '/audit_entries/'
|
43
|
+
friendly_url += href.split(/\//).last
|
44
|
+
friendly_url = friendly_url.gsub('ae-', '')
|
43
45
|
friendly_url
|
44
46
|
end
|
45
47
|
|
46
48
|
def details
|
47
|
-
|
49
|
+
tasker.show(view: 'extended').detail
|
48
50
|
end
|
49
51
|
end
|
50
52
|
end
|
data/lib/right_chimp/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: right_chimp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.2.
|
4
|
+
version: 2.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- RightScale Operations
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-11-
|
11
|
+
date: 2016-11-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|