include CommonApiTemplate
include Trashable
- serialize :properties, Hash
- serialize :storage_classes_desired, Array
- serialize :storage_classes_confirmed, Array
+ # Posgresql JSONB columns should NOT be declared as serialized, Rails 5
+ # already know how to properly treat them.
+ attribute :properties, :jsonbHash, default: {}
+ attribute :storage_classes_desired, :jsonbArray, default: ["default"]
+ attribute :storage_classes_confirmed, :jsonbArray, default: []
before_validation :default_empty_manifest
before_validation :default_storage_classes, on: :create
validate :ensure_pdh_matches_manifest_text
validate :ensure_storage_classes_desired_is_not_empty
validate :ensure_storage_classes_contain_non_empty_strings
- validate :old_versions_cannot_be_updated, on: :update
+ validate :versioning_metadata_updates, on: :update
+ validate :past_versions_cannot_be_updated, on: :update
+ after_validation :set_file_count_and_total_size
before_save :set_file_names
+ around_update :manage_versioning
api_accessible :user, extend: :common do |t|
t.add :name
t.add :version
t.add :current_version_uuid
t.add :preserve_version
+ t.add :file_count
+ t.add :file_size_total
end
after_initialize do
FILE_TOKEN = /^[[:digit:]]+:[[:digit:]]+:/
def check_signatures
- return false if self.manifest_text.nil?
+ throw(:abort) if self.manifest_text.nil?
return true if current_user.andand.is_admin
true
end
+ def set_file_count_and_total_size
+ # Only update the file stats if the manifest changed
+ if self.manifest_text_changed?
+ m = Keep::Manifest.new(self.manifest_text)
+ self.file_size_total = m.files_size
+ self.file_count = m.files_count
+ # If the manifest didn't change but the attributes did, ignore the changes
+ elsif self.file_count_changed? || self.file_size_total_changed?
+ self.file_count = self.file_count_was
+ self.file_size_total = self.file_size_total_was
+ end
+ true
+ end
+
def manifest_files
return '' if !self.manifest_text
['current_version_uuid']
end
- def save! *args
- # Skip if feature is disabled or saving a new record
- if !Rails.configuration.collection_versioning || new_record?
- return super
- end
- # Skip if updating a past version
- if !self.changes.include?('uuid') && current_version_uuid != uuid
- return super
- end
- # Skip if current version shouldn't (explicitly or implicitly) be preserved
- if !should_preserve_version?
- return super
- end
+ def manage_versioning
+ should_preserve_version = should_preserve_version? # Time sensitive, cache value
+ return(yield) unless (should_preserve_version || syncable_updates.any?)
+ # Put aside the changes because with_lock forces a record reload
changes = self.changes
- # Updates that will be synced with older versions
- synced_updates = ['uuid', 'owner_uuid', 'delete_at', 'trash_at', 'is_trashed',
- 'replication_desired', 'storage_classes_desired'] & changes.keys
- # Updates that will produce a new version
- versionable_updates = ['manifest_text', 'description', 'properties', 'name'] & changes.keys
-
- if versionable_updates.empty?
- # Keep preserve_version enabled for the next update, if applicable.
- self.preserve_version ||= self.preserve_version_was
- if !self.changes.include?('preserve_version')
- changes.delete('preserve_version')
- end
-
- if synced_updates.empty?
- # Updates don't include interesting attributes, so don't save a new
- # snapshot nor sync older versions.
- return super
+ snapshot = nil
+ with_lock do
+ # Copy the original state to save it as old version
+ if should_preserve_version
+ snapshot = self.dup
+ snapshot.uuid = nil # Reset UUID so it's created as a new record
+ snapshot.created_at = self.created_at
end
- end
- # Does row locking (transaction is implicit) because 'version'
- # may be incremented and the older versions synced.
- # Note that 'with_lock' reloads the object after locking.
- with_lock do
- # Sync older versions.
- if !synced_updates.empty?
- updates = {}
- synced_updates.each do |attr|
- if attr == 'uuid'
- # Point old versions to current version's new UUID
- updates['current_version_uuid'] = changes[attr].last
- else
- updates[attr] = changes[attr].last
- end
+ # Restore requested changes on the current version
+ changes.keys.each do |attr|
+ if attr == 'preserve_version' && changes[attr].last == false
+ next # Ignore false assignment, once true it'll be true until next version
end
- Collection.where('current_version_uuid = ? AND uuid != ?', uuid, uuid).each do |c|
- c.attributes = updates
- # Use a different validation context to skip the 'old_versions_cannot_be_updated'
- # validator, as on this case it is legal to update some fields.
- leave_modified_by_user_alone do
- c.save(context: :update_old_versions)
- end
+ self.attributes = {attr => changes[attr].last}
+ if attr == 'uuid'
+ # Also update the current version reference
+ self.attributes = {'current_version_uuid' => changes[attr].last}
end
- # Also update current object just in case a new version will be created,
- # as it has to receive the same values for the synced attributes.
- self.attributes = updates
end
- snapshot = nil
- # Make a new version if applicable.
- if !versionable_updates.empty?
- # Create a snapshot of the original collection
- snapshot = self.dup
- snapshot.uuid = nil # Reset UUID so it's created as a new record
- snapshot.created_at = created_at
- # Update current version number
+
+ if should_preserve_version
self.version += 1
self.preserve_version = false
end
- # Restore requested changes on the current version
- changes.keys.each do |attr|
- next if attr == 'version'
- self.attributes = {attr => changes[attr].last}
+
+ yield
+
+ sync_past_versions if syncable_updates.any?
+ if snapshot
+ snapshot.attributes = self.syncable_updates
+ snapshot.manifest_text = snapshot.signed_manifest_text
+ snapshot.save
+ end
+ end
+ end
+
+ def syncable_updates
+ updates = {}
+ (syncable_attrs & self.changes.keys).each do |attr|
+ if attr == 'uuid'
+ # Point old versions to current version's new UUID
+ updates['current_version_uuid'] = self.changes[attr].last
+ else
+ updates[attr] = self.changes[attr].last
end
- # Save current version first to avoid index collision
- super
- # Save the snapshot with previous state (if applicable)
- snapshot.andand.save!
- return true
end
+ return updates
+ end
+
+ def sync_past_versions
+ updates = self.syncable_updates
+ Collection.where('current_version_uuid = ? AND uuid != ?', self.uuid_was, self.uuid_was).each do |c|
+ c.attributes = updates
+ # Use a different validation context to skip the 'old_versions_cannot_be_updated'
+ # validator, as on this case it is legal to update some fields.
+ leave_modified_by_user_alone do
+ leave_modified_at_alone do
+ c.save(context: :update_old_versions)
+ end
+ end
+ end
+ end
+
+ def versionable_updates?(attrs)
+ (['manifest_text', 'description', 'properties', 'name'] & attrs).any?
+ end
+
+ def syncable_attrs
+ ['uuid', 'owner_uuid', 'delete_at', 'trash_at', 'is_trashed', 'replication_desired', 'storage_classes_desired']
end
def should_preserve_version?
+ return false unless (Rails.configuration.collection_versioning && versionable_updates?(self.changes.keys))
+
idle_threshold = Rails.configuration.preserve_version_if_idle
if !self.preserve_version_was &&
(idle_threshold < 0 ||
end
def check_encoding
- if manifest_text.encoding.name == 'UTF-8' and manifest_text.valid_encoding?
- true
- else
+ if !(manifest_text.encoding.name == 'UTF-8' and manifest_text.valid_encoding?)
begin
# If Ruby thinks the encoding is something else, like 7-bit
# ASCII, but its stored bytes are equal to the (valid) UTF-8
rescue
end
errors.add :manifest_text, "must use UTF-8 encoding"
- false
+ throw(:abort)
end
end
true
rescue ArgumentError => e
errors.add :manifest_text, e.message
- false
+ throw(:abort)
end
end
if loc = Keep::Locator.parse(search_term)
loc.strip_hints!
coll_match = readable_by(*readers).where(portable_data_hash: loc.to_s).limit(1)
- return get_compatible_images(readers, pattern, coll_match)
+ if coll_match.any? or Rails.configuration.remote_hosts.length == 0
+ return get_compatible_images(readers, pattern, coll_match)
+ else
+ # Allow bare pdh that doesn't exist in the local database so
+ # that federated container requests which refer to remotely
+ # stored containers will validate.
+ return [Collection.new(portable_data_hash: loc.to_s)]
+ end
end
if search_tag.nil? and (n = search_term.index(":"))
end
end
- def old_versions_cannot_be_updated
+ def past_versions_cannot_be_updated
# We check for the '_was' values just in case the update operation
# includes a change on current_version_uuid or uuid.
if current_version_uuid_was != uuid_was
- raise ArvadosModel::PermissionDeniedError.new("previous versions cannot be updated")
+ errors.add(:base, "past versions cannot be updated")
+ false
+ end
+ end
+
+ def versioning_metadata_updates
+ valid = true
+ if (current_version_uuid_was == uuid_was) && current_version_uuid_changed?
+ errors.add(:current_version_uuid, "cannot be updated")
+ valid = false
+ end
+ if version_changed?
+ errors.add(:version, "cannot be updated")
+ valid = false
end
+ valid
end
def assign_uuid
projects / arvados.git / blobdiff