projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8123: Fix crunchstat formatting error and resulting crunchstat-summary crash.
[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 41a16bfd5da64bcf6604c4dfae83723068bd40f5..6c24293334f6d4cc5af371b1b2b9a0d370466530 100644
(file)
--- a/
services/api/app/models/job.rb
+++ b/
services/api/app/models/job.rb
@@
-11,8
+11,8
@@
class Job < ArvadosModel
before_validation :set_priority
before_validation :update_state_from_old_state_attrs
validate :ensure_script_version_is_commit
before_validation :set_priority
before_validation :update_state_from_old_state_attrs
validate :ensure_script_version_is_commit
- validate :find_arvados_sdk_version
validate :find_docker_image_locator
validate :find_docker_image_locator
+ validate :find_arvados_sdk_version
validate :validate_status
validate :validate_state_change
validate :ensure_no_collection_uuids_in_script_params
validate :validate_status
validate :validate_state_change
validate :ensure_no_collection_uuids_in_script_params
@@
-125,7
+125,7
@@
class Job < ArvadosModel
end
def ensure_script_version_is_commit
end
def ensure_script_version_is_commit
- if s
elf.s
tate == Running
+ if state == Running
# Apparently client has already decided to go for it. This is
# needed to run a local job using a local working directory
# instead of a commit-ish.
# Apparently client has already decided to go for it. This is
# needed to run a local job using a local working directory
# instead of a commit-ish.
@@
-147,9
+147,12
@@
class Job < ArvadosModel
end
def tag_version_in_internal_repository
end
def tag_version_in_internal_repository
- if s
elf.s
tate == Running
+ if state == Running
# No point now. See ensure_script_version_is_commit.
true
# No point now. See ensure_script_version_is_commit.
true
+ elsif errors.any?
+ # Won't be saved, and script_version might not even be valid.
+ true
elsif new_record? or repository_changed? or script_version_changed?
uuid_was = uuid
begin
elsif new_record? or repository_changed? or script_version_changed?
uuid_was = uuid
begin
@@
-202,6
+205,10
@@
class Job < ArvadosModel
end
def find_docker_image_locator
end
def find_docker_image_locator
+ runtime_constraints['docker_image'] =
+ Rails.configuration.default_docker_image_for_jobs if ((runtime_constraints.is_a? Hash) and
+ (runtime_constraints['docker_image']).nil? and
+ Rails.configuration.default_docker_image_for_jobs)
resolve_runtime_constraint("docker_image",
:docker_image_locator) do |image_search|
image_tag = runtime_constraints['docker_image_tag']
resolve_runtime_constraint("docker_image",
:docker_image_locator) do |image_search|
image_tag = runtime_constraints['docker_image_tag']