X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4f552c0187f8c31d94ff74485c57ef7f9888597e..c1e7255a85dfc2807ba78e1cf9d109d896c80b42:/services/api/app/models/job.rb diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb index 0b2247bc21..fbc5640b37 100644 --- a/services/api/app/models/job.rb +++ b/services/api/app/models/job.rb @@ -1,5 +1,5 @@ class Job < ArvadosModel - include AssignUuid + include HasUuid include KindAndEtag include CommonApiTemplate serialize :script_parameters, Hash @@ -74,6 +74,10 @@ class Job < ArvadosModel super + %w(cancelled_by_client_uuid) end + def skip_uuid_existence_check + super + %w(output log) + 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 @@ -82,7 +86,7 @@ class Job < ArvadosModel return true end if new_record? or script_version_changed? - sha1 = Commit.find_commit_range(current_user, nil, nil, self.script_version, nil)[0] rescue nil + sha1 = Commit.find_commit_range(current_user, self.repository, nil, self.script_version, nil)[0] rescue nil if sha1 self.script_version = sha1 else