Merge branch 'master' into 3106-modal-loading-indicator

[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 d5d2eddf7d3b382353dab2b10e08e505f4e3d2b3..4dcf2567d7865131a6a2bc025300c962ec360605 100644 (file)
--- a/services/api/app/models/job_task.rb
+++ b/services/api/app/models/job_task.rb
@@ -3,8 +3,8 @@ class JobTask < ArvadosModel
   include KindAndEtag
   include CommonApiTemplate
   serialize :parameters, Hash
+  before_create :set_default_qsequence
   after_update :delete_created_job_tasks_if_failed
-  after_update :assign_created_job_tasks_qsequence_if_succeeded
 
   api_accessible :user, extend: :common do |t|
     t.add :job_uuid
@@ -25,12 +25,8 @@ class JobTask < ArvadosModel
     end
   end
 
-  def assign_created_job_tasks_qsequence_if_succeeded
-    if self.success == false and self.success != self.success_was
-      # xxx qsequence should be sequential as advertised; for now at
-      # least it's non-decreasing.
-      JobTask.update_all(['qsequence = ?', (Time.now.to_f*10000000).to_i],
-                         ['created_by_job_task_uuid = ?', self.uuid])
-    end
+  def set_default_qsequence
+    self.qsequence ||= self.class.connection.
+      select_value("SELECT nextval('job_tasks_qsequence_seq')")
   end
 end