projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10293-cwl-cr-output
[arvados.git]
/
services
/
api
/
app
/
models
/
job_task.rb
diff --git
a/services/api/app/models/job_task.rb
b/services/api/app/models/job_task.rb
index 89328ded046858accf70f179e6af9ae00f9e6fd4..5f83fbe162568dd7694e35fe8a3e3d43ec37406e 100644
(file)
--- a/
services/api/app/models/job_task.rb
+++ b/
services/api/app/models/job_task.rb
@@
-3,6
+3,7
@@
class JobTask < ArvadosModel
include KindAndEtag
include CommonApiTemplate
serialize :parameters, Hash
include KindAndEtag
include CommonApiTemplate
serialize :parameters, Hash
+ before_create :set_default_qsequence
after_update :delete_created_job_tasks_if_failed
api_accessible :user, extend: :common do |t|
after_update :delete_created_job_tasks_if_failed
api_accessible :user, extend: :common do |t|
@@
-14,6
+15,8
@@
class JobTask < ArvadosModel
t.add :output
t.add :progress
t.add :success
t.add :output
t.add :progress
t.add :success
+ t.add :started_at
+ t.add :finished_at
end
protected
end
protected
@@
-23,4
+26,9
@@
class JobTask < ArvadosModel
JobTask.delete_all ['created_by_job_task_uuid = ?', self.uuid]
end
end
JobTask.delete_all ['created_by_job_task_uuid = ?', self.uuid]
end
end
+
+ def set_default_qsequence
+ self.qsequence ||= self.class.connection.
+ select_value("SELECT nextval('job_tasks_qsequence_seq')")
+ end
end
end