X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/86c192b3ae3614f69305cfd60664c9b720b84692..2de827e57ae9ba1b0d322199d071ae900a5b7e0c:/services/api/app/models/job.rb diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb index 6e3f90c38f..a23989309a 100644 --- a/services/api/app/models/job.rb +++ b/services/api/app/models/job.rb @@ -27,6 +27,7 @@ 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 @@ -37,6 +38,7 @@ class Job < ArvadosModel t.add :log_stream_href t.add :log_buffer t.add :nondeterministic + t.add :repository end def assert_finished @@ -68,6 +70,14 @@ class Job < ArvadosModel super + %w(output log) end + def skip_uuid_read_permission_check + 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 @@ -76,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