rbbt-util 5.17.70 → 5.17.71
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbbt/rest/client/step.rb +6 -10
- data/lib/rbbt/tsv/parallel/traverse.rb +1 -1
- data/lib/rbbt/util/log/progress.rb +1 -0
- data/lib/rbbt/workflow/step/run.rb +4 -2
- 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: 257d69c8b2bd1dd30b2140f0bf8a12da6d98cf05
|
4
|
+
data.tar.gz: 87ced61d3865d938fb316bef1cd99b0a2a842cb6
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: be58086a415eed7d571d56c98bcdca03a8dc9c3c3222cbc8e6d36f0a827bef55e2a44a05431532bfa518a393e8031530207247aa0db8b38bfba1e58dc3625504
|
7
|
+
data.tar.gz: c9106df3f09c54d9443b4418e3b207c143540ea1c3191692f31f878a09ccc10435992c1f794fa1ee96e4c125a8277aaffd628ba276fa25b1a0be43f92f9f07ae
|
@@ -61,11 +61,11 @@ class WorkflowRESTClient
|
|
61
61
|
|
62
62
|
#{{{ MANAGEMENT
|
63
63
|
|
64
|
-
def init_job(cache_type = nil)
|
64
|
+
def init_job(cache_type = nil, other_params = {})
|
65
65
|
cache_type = :asynchronous if cache_type.nil? and not @is_exec
|
66
66
|
cache_type = :exec if cache_type.nil?
|
67
67
|
@name ||= Persist.memory("RemoteSteps", :workflow => self, :task => task, :jobname => @name, :inputs => inputs, :cache_type => cache_type) do
|
68
|
-
WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(:jobname => @name||@base_name, :_cache_type => cache_type))
|
68
|
+
WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(other_params).merge(:jobname => @name||@base_name, :_cache_type => cache_type))
|
69
69
|
end
|
70
70
|
@url = File.join(base_url, task.to_s, @name)
|
71
71
|
nil
|
@@ -170,12 +170,10 @@ class WorkflowRESTClient
|
|
170
170
|
|
171
171
|
def recursive_clean
|
172
172
|
begin
|
173
|
-
|
174
|
-
|
175
|
-
init_job
|
173
|
+
params = {:_update => :recursive_clean}
|
174
|
+
init_job(nil, params)
|
176
175
|
WorkflowRESTClient.get_raw(url, params)
|
177
176
|
_restart
|
178
|
-
init_job
|
179
177
|
rescue Exception
|
180
178
|
Log.exception $!
|
181
179
|
end
|
@@ -184,12 +182,10 @@ class WorkflowRESTClient
|
|
184
182
|
|
185
183
|
def clean
|
186
184
|
begin
|
187
|
-
|
188
|
-
|
189
|
-
init_job
|
185
|
+
params = {:_update => :clean}
|
186
|
+
init_job(nil, params)
|
190
187
|
WorkflowRESTClient.get_raw(url, params)
|
191
188
|
_restart
|
192
|
-
init_job
|
193
189
|
rescue Exception
|
194
190
|
Log.exception $!
|
195
191
|
end
|
@@ -140,8 +140,10 @@ class Step
|
|
140
140
|
log :dependencies, "#{Log.color :magenta, "Dependencies"} #{Log.color :yellow, task.name.to_s || ""}"
|
141
141
|
dupping = []
|
142
142
|
@seen.each do |dependency|
|
143
|
-
next if (dependency.done? and not dependency.dirty?) or
|
144
|
-
|
143
|
+
next if (dependency.done? and not dependency.dirty?) or
|
144
|
+
(dependency.streaming? and dependency.running?) or
|
145
|
+
(defined? WorkflowRESTClient and WorkflowRESTClient::RemoteStep === dependency and not (dependency.error? or dependency.aborted?))
|
146
|
+
dependency.clean if dependency.started? and dependency
|
145
147
|
dupping << dependency unless dependencies.include? dependency
|
146
148
|
end
|
147
149
|
|