[ARVADOS] updated: 93901e794e11dbb5717288b006714fac7d13cb21
git at public.curoverse.com
git at public.curoverse.com
Tue May 27 13:04:18 EDT 2014
Summary of changes:
sdk/cli/bin/arv-run-pipeline-instance | 16 +---------------
services/api/script/crunch-dispatch.rb | 10 +---------
2 files changed, 2 insertions(+), 24 deletions(-)
via 93901e794e11dbb5717288b006714fac7d13cb21 (commit)
from a8da71bb7b0c4f319afd50ee6cd5d593f1237d33 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 93901e794e11dbb5717288b006714fac7d13cb21
Author: radhika <radhika at curoverse.com>
Date: Tue May 27 13:02:47 2014 -0400
2678: upon Tom's feedback, setting owner_uuid of the pi whether or not the pi belongs to a group.
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index bf493cf..fc636df 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -443,25 +443,11 @@ class WhRunPipelineInstance
moretodo = true
interrupted = false
- # check if the pipeline os owned by a group
- owner_uuid = nil
- group_result = $client.execute(:api_method => $arvados.groups.get,
- :parameters => {
- :uuid => @instance[:owner_uuid]
- },
- :authenticated => false,
- :headers => {
- authorization: 'OAuth2 '+ENV['ARVADOS_API_TOKEN']
- })
- group = JSON.parse group_result.body, :symbolize_names => true
- if group[:uuid]
- owner_uuid = group[:uuid]
- end
-
while moretodo
moretodo = false
@components.each do |cname, c|
job = nil
+ owner_uuid = @instance[:owner_uuid]
# Is the job satisfying this component already known to be
# finished? (Already meaning "before we query API server about
# the job's current state")
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 3b29f10..88ed689 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -391,18 +391,10 @@ class Dispatcher
# send message to log table. we want these records to be transient
def write_log running_job
- begin
- owner_uuid = nil
- begin
- Group.find_by_uuid(running_job[:job].owner_uuid)
- owner_uuid = running_job[:job].owner_uuid
- rescue
- end
-
if (running_job && running_job[:stderr_buf] != '')
log = Log.new(object_uuid: running_job[:job].uuid,
event_type: 'stderr',
- owner_uuid: owner_uuid,
+ owner_uuid: running_job[:job].owner_uuid,
properties: {"text" => running_job[:stderr_buf]})
log.save!
running_job[:stderr_buf] = ''
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list