projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15529: LoginCluster uses ApiClientAuthorization.remote_host
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
pipeline_instance.rb
diff --git
a/apps/workbench/app/models/pipeline_instance.rb
b/apps/workbench/app/models/pipeline_instance.rb
index f54b9f0c0084b257fae3d6d5e6b4a5f427068066..dd2cc0ab77e20d6ad45e78871f174bec3936acb5 100644
(file)
--- a/
apps/workbench/app/models/pipeline_instance.rb
+++ b/
apps/workbench/app/models/pipeline_instance.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
require "arvados/keep"
class PipelineInstance < ArvadosBase
require "arvados/keep"
class PipelineInstance < ArvadosBase
@@
-13,7
+17,7
@@
class PipelineInstance < ArvadosBase
template = if lookup and lookup[self.pipeline_template_uuid]
lookup[self.pipeline_template_uuid]
else
template = if lookup and lookup[self.pipeline_template_uuid]
lookup[self.pipeline_template_uuid]
else
- PipelineTemplate.
where(uuid: self.pipeline_template_uuid).first
+ PipelineTemplate.
find?(self.pipeline_template_uuid) if self.pipeline_template_uuid
end
if template
template.name
end
if template
template.name
@@
-103,9
+107,10
@@
class PipelineInstance < ArvadosBase
def stderr_log_query(limit=nil)
query = Log.
def stderr_log_query(limit=nil)
query = Log.
- where(event_type: "stderr",
- object_uuid: stderr_log_object_uuids).
- order("id DESC")
+ with_count('none').
+ where(event_type: "stderr",
+ object_uuid: stderr_log_object_uuids).
+ order("created_at DESC")
unless limit.nil?
query = query.limit(limit)
end
unless limit.nil?
query = query.limit(limit)
end
@@
-132,8
+137,12
@@
class PipelineInstance < ArvadosBase
end
end
end
end
- def work_unit label
- PipelineInstanceWorkUnit.new(self, label || self.name)
+ def work_unit(label=nil)
+ PipelineInstanceWorkUnit.new(self, label || self.name, self.uuid)
+ end
+
+ def cancel
+ arvados_api_client.api "pipeline_instances/#{self.uuid}/", "cancel", {"cascade" => true}
end
private
end
private