X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/224f384d411bb1b4cccc7165c55bb64fd5c695ad..d121e087ad1b4e91f869dbd57534c6d6ce51d19d:/apps/workbench/app/models/job.rb diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb index bf202c4eaa..128440d526 100644 --- a/apps/workbench/app/models/job.rb +++ b/apps/workbench/app/models/job.rb @@ -27,7 +27,7 @@ class Job < ArvadosBase 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 @@ -43,7 +43,7 @@ class Job < ArvadosBase end def stderr_log_query(limit=nil) - query = Log.where(object_uuid: self.uuid).order("created_at DESC") + query = Log.where(object_uuid: self.uuid).order("created_at DESC").with_count('none') query = query.limit(limit) if limit query end @@ -54,6 +54,6 @@ class Job < ArvadosBase end def work_unit(label=nil) - JobWorkUnit.new(self, label) + JobWorkUnit.new(self, label, self.uuid) end end