projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'main' from workbench2.git
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
job.rb
diff --git
a/apps/workbench/app/models/job.rb
b/apps/workbench/app/models/job.rb
index 6566aeb7cd5f82c4aa9e8f16a88b4d287f1afc24..7c55d9e857cfa89a9c448d3c77ccda829b747449 100644
(file)
--- a/
apps/workbench/app/models/job.rb
+++ b/
apps/workbench/app/models/job.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
class Job < ArvadosBase
def self.goes_in_projects?
true
class Job < ArvadosBase
def self.goes_in_projects?
true
@@
-27,7
+31,7
@@
class Job < ArvadosBase
end
def cancel
end
def cancel
- arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
+ arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {
"cascade" => true
}
end
def self.queue_size
end
def self.queue_size
@@
-43,8
+47,7
@@
class Job < ArvadosBase
end
def stderr_log_query(limit=nil)
end
def stderr_log_query(limit=nil)
- query = Log.where(event_type: "stderr", object_uuid: self.uuid)
- .order("id DESC")
+ query = Log.where(object_uuid: self.uuid).order("created_at DESC").with_count('none')
query = query.limit(limit) if limit
query
end
query = query.limit(limit) if limit
query
end
@@
-53,4
+56,8
@@
class Job < ArvadosBase
stderr_log_query(limit).results.reverse.
flat_map { |log| log.properties[:text].split("\n") rescue [] }
end
stderr_log_query(limit).results.reverse.
flat_map { |log| log.properties[:text].split("\n") rescue [] }
end
+
+ def work_unit(label=nil)
+ JobWorkUnit.new(self, label, self.uuid)
+ end
end
end