scout-gear 10.11.1 → 10.11.2
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/VERSION +1 -1
- data/lib/scout/workflow/deployment/local.rb +16 -2
- data/lib/scout/workflow/step/load.rb +1 -1
- data/scout-gear.gemspec +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 77727bffd885a022ae17b23477024af34da91584f2ac55cd410483d1b6074e5a
|
|
4
|
+
data.tar.gz: b6631c3b02c5c90194c60e68c0a6d6abd1b45ea74c3152422328488e8397f524
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1ad9229647dfe17146a3e5d3eac31347dde32e5b74f5e866c42b24a1e82816a2a9ef9a3ee61f020e18479decdf0d1c0c7b8fb33afa742f9d3b88602b86dc6c04
|
|
7
|
+
data.tar.gz: f51b0bdb79d3aa42f27697ad01b598ee79e0eb71ecaa172f38005926c1a0c13b08751475ff7d374699b7d1f42922222c025a5b6cb2430864e69b064b63168009
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
10.11.
|
|
1
|
+
10.11.2
|
|
@@ -45,6 +45,7 @@ class Workflow::LocalExecutor
|
|
|
45
45
|
end
|
|
46
46
|
|
|
47
47
|
def process_batches(batches)
|
|
48
|
+
retry_jobs = []
|
|
48
49
|
failed_jobs = []
|
|
49
50
|
|
|
50
51
|
while batches.reject{|b| Workflow::Orchestrator.done_batch?(b) }.any?
|
|
@@ -54,6 +55,16 @@ class Workflow::LocalExecutor
|
|
|
54
55
|
|
|
55
56
|
raise NoWork, "No candidates and no running jobs #{Log.fingerprint batches}" if resources_used.empty? && top_level_jobs.empty?
|
|
56
57
|
|
|
58
|
+
if candidates.reject{|batch| failed_jobs.include? batch[:top_level] }.empty? && resources_used.empty? && top_level_jobs.empty?
|
|
59
|
+
exception = failed_jobs.collect(&:get_exception).compact.first
|
|
60
|
+
if exception
|
|
61
|
+
Log.warn 'Some work failed'
|
|
62
|
+
raise exception
|
|
63
|
+
else
|
|
64
|
+
raise 'Some work failed'
|
|
65
|
+
end
|
|
66
|
+
end
|
|
67
|
+
|
|
57
68
|
candidates.each do |batch|
|
|
58
69
|
begin
|
|
59
70
|
|
|
@@ -63,15 +74,18 @@ class Workflow::LocalExecutor
|
|
|
63
74
|
when (job.error? || job.aborted?)
|
|
64
75
|
begin
|
|
65
76
|
if job.recoverable_error?
|
|
66
|
-
if
|
|
77
|
+
if retry_jobs.include?(job)
|
|
67
78
|
Log.warn "Failed twice #{job.path} with recoverable error"
|
|
79
|
+
retry_jobs.delete job
|
|
80
|
+
failed_jobs << job
|
|
68
81
|
next
|
|
69
82
|
else
|
|
70
|
-
|
|
83
|
+
retry_jobs << job
|
|
71
84
|
job.clean
|
|
72
85
|
raise TryAgain
|
|
73
86
|
end
|
|
74
87
|
else
|
|
88
|
+
failed_jobs << job
|
|
75
89
|
Log.warn "Non-recoverable error in #{job.path}"
|
|
76
90
|
next
|
|
77
91
|
end
|
data/scout-gear.gemspec
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
# DO NOT EDIT THIS FILE DIRECTLY
|
|
3
3
|
# Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
|
|
4
4
|
# -*- encoding: utf-8 -*-
|
|
5
|
-
# stub: scout-gear 10.11.
|
|
5
|
+
# stub: scout-gear 10.11.2 ruby lib
|
|
6
6
|
|
|
7
7
|
Gem::Specification.new do |s|
|
|
8
8
|
s.name = "scout-gear".freeze
|
|
9
|
-
s.version = "10.11.
|
|
9
|
+
s.version = "10.11.2".freeze
|
|
10
10
|
|
|
11
11
|
s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
|
|
12
12
|
s.require_paths = ["lib".freeze]
|