projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15306: Adds include_trash param definition to container requests.
[arvados.git]
/
services
/
api
/
app
/
models
/
job.rb
diff --git
a/services/api/app/models/job.rb
b/services/api/app/models/job.rb
index 7508ead5d5c31bd397d2b0958eac72f4712d2062..4d63deb99cd1d236b348996228c0d3b036416e6e 100644
(file)
--- a/
services/api/app/models/job.rb
+++ b/
services/api/app/models/job.rb
@@
-12,7
+12,6
@@
class Job < ArvadosModel
extend CurrentApiClient
extend LogReuseInfo
serialize :components, Hash
extend CurrentApiClient
extend LogReuseInfo
serialize :components, Hash
- attr_protected :arvados_sdk_version, :docker_image_locator
serialize :script_parameters, Hash
serialize :runtime_constraints, Hash
serialize :tasks_summary, Hash
serialize :script_parameters, Hash
serialize :runtime_constraints, Hash
serialize :tasks_summary, Hash
@@
-83,6
+82,10
@@
class Job < ArvadosModel
["components"]
end
["components"]
end
+ def self.protected_attributes
+ [:arvados_sdk_version, :docker_image_locator]
+ end
+
def assert_finished
update_attributes(finished_at: finished_at || db_current_time,
success: success.nil? ? false : success,
def assert_finished
update_attributes(finished_at: finished_at || db_current_time,
success: success.nil? ? false : success,
@@
-284,7
+287,7
@@
class Job < ArvadosModel
log_reuse_info { "job #{j.uuid} has nil output" }
elsif j.log.nil?
log_reuse_info { "job #{j.uuid} has nil log" }
log_reuse_info { "job #{j.uuid} has nil output" }
elsif j.log.nil?
log_reuse_info { "job #{j.uuid} has nil log" }
- elsif Rails.configuration.
reuse_job_if_outputs_d
iffer
+ elsif Rails.configuration.
Containers.JobsAPI.ReuseJobIfOutputsD
iffer
if !Collection.readable_by(current_user).find_by_portable_data_hash(j.output)
# Ignore: keep looking for an incomplete job or one whose
# output is readable.
if !Collection.readable_by(current_user).find_by_portable_data_hash(j.output)
# Ignore: keep looking for an incomplete job or one whose
# output is readable.
@@
-488,9
+491,9
@@
class Job < ArvadosModel
end
def find_docker_image_locator
end
def find_docker_image_locator
- if runtime_constraints.is_a? Hash
+ if runtime_constraints.is_a? Hash
and Rails.configuration.Containers.JobsAPI.DefaultDockerImage != ""
runtime_constraints['docker_image'] ||=
runtime_constraints['docker_image'] ||=
- Rails.configuration.
default_docker_image_for_jobs
+ Rails.configuration.
Containers.JobsAPI.DefaultDockerImage
end
resolve_runtime_constraint("docker_image",
end
resolve_runtime_constraint("docker_image",
@@
-566,7
+569,7
@@
class Job < ArvadosModel
def trigger_crunch_dispatch_if_cancelled
if @need_crunch_dispatch_trigger
def trigger_crunch_dispatch_if_cancelled
if @need_crunch_dispatch_trigger
- File.open(Rails.configuration.
crunch_refresh_t
rigger, 'wb') do
+ File.open(Rails.configuration.
Containers.JobsAPI.CrunchRefreshT
rigger, 'wb') do
# That's all, just create/touch a file for crunch-job to see.
end
end
# That's all, just create/touch a file for crunch-job to see.
end
end