# already know how to properly treat them.
attribute :properties, :jsonbHash, default: {}
attribute :secret_mounts, :jsonbHash, default: {}
+ attribute :output_storage_classes, :jsonbArray, default: lambda { Rails.configuration.DefaultStorageClasses }
serialize :environment, Hash
serialize :mounts, Hash
after_find :fill_container_defaults_after_find
before_validation :fill_field_defaults, :if => :new_record?
before_validation :fill_container_defaults
- before_validation :set_default_preemptible_scheduling_parameter
- before_validation :set_container
validates :command, :container_image, :output_path, :cwd, :presence => true
validates :output_ttl, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
validates :priority, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: 1000 }
validate :check_update_whitelist
validate :secret_mounts_key_conflict
validate :validate_runtime_token
- before_save :scrub_secrets
+ after_validation :scrub_secrets
+ after_validation :set_preemptible
+ after_validation :set_container
before_create :set_requesting_container_uuid
before_destroy :set_priority_zero
after_save :update_priority
t.add :scheduling_parameters
t.add :state
t.add :use_existing
+ t.add :output_storage_classes
end
# Supported states for a container request
:container_image, :cwd, :environment, :filters, :mounts,
:output_path, :priority, :runtime_token,
:runtime_constraints, :state, :container_uuid, :use_existing,
- :scheduling_parameters, :secret_mounts, :output_name, :output_ttl]
+ :scheduling_parameters, :secret_mounts, :output_name, :output_ttl,
+ :output_storage_classes]
+
+ def self.any_preemptible_instances?
+ Rails.configuration.InstanceTypes.any? do |k, v|
+ v["Preemptible"]
+ end
+ end
def self.limit_index_columns_read
["mounts"]
'container_uuid' => container_uuid,
},
portable_data_hash: log_col.portable_data_hash,
- manifest_text: log_col.manifest_text)
+ manifest_text: log_col.manifest_text,
+ storage_classes_desired: self.output_storage_classes
+ )
completed_coll.save_with_unique_name!
end
end
owner_uuid: self.owner_uuid,
name: coll_name,
manifest_text: "",
+ storage_classes_desired: self.output_storage_classes,
properties: {
'type' => out_type,
'container_request' => uuid,
end
def self.full_text_searchable_columns
- super - ["mounts", "secret_mounts", "secret_mounts_md5", "runtime_token"]
+ super - ["mounts", "secret_mounts", "secret_mounts_md5", "runtime_token", "output_storage_classes"]
end
protected
errors.add :container_uuid, "can only be updated to nil."
return false
end
+ if self.container_count_changed?
+ errors.add :container_count, "cannot be updated directly."
+ return false
+ end
if state_changed? and state == Committed and container_uuid.nil?
while true
c = Container.resolve(self)
end
end
if self.container_uuid != self.container_uuid_was
- if self.container_count_changed?
- errors.add :container_count, "cannot be updated directly."
- return false
- end
-
self.container_count += 1
return if self.container_uuid_was.nil?
log_coll = Collection.new(
owner_uuid: self.owner_uuid,
name: coll_name = "Container log for request #{uuid}",
- manifest_text: "")
+ manifest_text: "",
+ storage_classes_desired: self.output_storage_classes)
end
# copy logs from old container into CR's log collection
end
end
- def set_default_preemptible_scheduling_parameter
- if Rails.configuration.Containers.UsePreemptibleInstances && state == Committed && get_requesting_container()
+ def set_preemptible
+ if (new_record? || state_changed?) &&
+ state == Committed &&
+ Rails.configuration.Containers.AlwaysUsePreemptibleInstances &&
+ get_requesting_container_uuid() &&
+ self.class.any_preemptible_instances?
self.scheduling_parameters['preemptible'] = true
end
end
scheduling_parameters['partitions'].size)
errors.add :scheduling_parameters, "partitions must be an array of strings"
end
- if !Rails.configuration.Containers.UsePreemptibleInstances and scheduling_parameters['preemptible']
- errors.add :scheduling_parameters, "preemptible instances are not allowed"
+ if scheduling_parameters['preemptible'] &&
+ (new_record? || state_changed?) &&
+ !self.class.any_preemptible_instances?
+ errors.add :scheduling_parameters, "preemptible instances are not configured in InstanceTypes"
end
if scheduling_parameters.include? 'max_run_time' and
(!scheduling_parameters['max_run_time'].is_a?(Integer) ||
if self.new_record? || self.state_was == Uncommitted
# Allow create-and-commit in a single operation.
permitted.push(*AttrsPermittedBeforeCommit)
+ elsif mounts_changed? && mounts_was.keys.sort == mounts.keys.sort
+ # Ignore the updated mounts if the only changes are default/zero
+ # values as added by controller, see 17774
+ only_defaults = true
+ mounts.each do |path, mount|
+ (mount.to_a - mounts_was[path].to_a).each do |k, v|
+ if ![0, "", false, nil].index(v)
+ only_defaults = false
+ end
+ end
+ end
+ if only_defaults
+ clear_attribute_change("mounts")
+ end
end
case self.state
when Committed
permitted.push :priority, :container_count_max, :container_uuid
- if self.container_uuid.nil?
- self.errors.add :container_uuid, "has not been resolved to a container."
- end
-
if self.priority.nil?
self.errors.add :priority, "cannot be nil"
end
- # Allow container count to increment by 1
- if (self.container_uuid &&
- self.container_uuid != self.container_uuid_was &&
- self.container_count == 1 + (self.container_count_was || 0))
- permitted.push :container_count
- end
+ # Allow container count to increment (not by client, only by us
+ # -- see set_container)
+ permitted.push :container_count
if current_user.andand.is_admin
permitted.push :log_uuid
end
def set_requesting_container_uuid
- c = get_requesting_container()
- if !c.nil?
- self.requesting_container_uuid = c.uuid
+ if (self.requesting_container_uuid = get_requesting_container_uuid())
# Determine the priority of container request for the requesting
# container.
self.priority = ContainerRequest.where(container_uuid: self.requesting_container_uuid).maximum("priority") || 0
end
end
- def get_requesting_container
- return self.requesting_container_uuid if !self.requesting_container_uuid.nil?
- Container.for_current_token
+ def get_requesting_container_uuid
+ return self.requesting_container_uuid || Container.for_current_token.andand.uuid
end
end
projects / arvados.git / blobdiff