X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6403b8728d3120d6cb22583b3963d2a030e88aa3..0cf2f356035164cd92e4a5722f0dd25c7502164e:/services/api/app/models/job.rb?ds=sidebyside diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb index f56b57ac7b..32f28e3582 100644 --- a/services/api/app/models/job.rb +++ b/services/api/app/models/job.rb @@ -8,6 +8,7 @@ class Job < ArvadosModel serialize :tasks_summary, Hash before_create :ensure_unique_submit_id after_commit :trigger_crunch_dispatch_if_cancelled, :on => :update + before_validation :set_priority validate :ensure_script_version_is_commit validate :find_docker_image_locator @@ -28,7 +29,6 @@ class Job < ArvadosModel t.add :started_at t.add :finished_at t.add :output - t.add :output_is_persistent t.add :success t.add :running t.add :is_locked_by_uuid @@ -40,7 +40,6 @@ class Job < ArvadosModel t.add :repository t.add :supplied_script_version t.add :docker_image_locator - t.add :name t.add :description end @@ -75,6 +74,13 @@ class Job < ArvadosModel super + %w(output log) end + def set_priority + if self.priority.nil? + self.priority = 0 + end + true + end + def ensure_script_version_is_commit if self.is_locked_by_uuid and self.started_at # Apparently client has already decided to go for it. This is