projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16470: Discards changes before locking instead of reloading the record.
[arvados.git]
/
services
/
api
/
app
/
models
/
collection.rb
diff --git
a/services/api/app/models/collection.rb
b/services/api/app/models/collection.rb
index 99933ba7e7df0ef3bc90ec08f8aab49760b68851..8b549a71ab4fba348ab9279f456595912fb693db 100644
(file)
--- a/
services/api/app/models/collection.rb
+++ b/
services/api/app/models/collection.rb
@@
-259,9
+259,10
@@
class Collection < ArvadosModel
should_preserve_version = should_preserve_version? # Time sensitive, cache value
return(yield) unless (should_preserve_version || syncable_updates.any?)
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
forc
es a record reload
+ # Put aside the changes because with_lock
do
es a record reload
changes = self.changes
snapshot = nil
changes = self.changes
snapshot = nil
+ restore_attributes
with_lock do
# Copy the original state to save it as old version
if should_preserve_version
with_lock do
# Copy the original state to save it as old version
if should_preserve_version
@@
-303,12
+304,18
@@
class Collection < ArvadosModel
def syncable_updates
updates = {}
def syncable_updates
updates = {}
- (syncable_attrs & self.changes.keys).each do |attr|
+ if self.changes.any?
+ changes = self.changes
+ else
+ # If called after save...
+ changes = self.saved_changes
+ end
+ (syncable_attrs & changes.keys).each do |attr|
if attr == 'uuid'
# Point old versions to current version's new UUID
if attr == 'uuid'
# Point old versions to current version's new UUID
- updates['current_version_uuid'] =
self.
changes[attr].last
+ updates['current_version_uuid'] = changes[attr].last
else
else
- updates[attr] =
self.
changes[attr].last
+ updates[attr] = changes[attr].last
end
end
return updates
end
end
return updates
@@
-316,7
+323,7
@@
class Collection < ArvadosModel
def sync_past_versions
updates = self.syncable_updates
def sync_past_versions
updates = self.syncable_updates
- Collection.where('current_version_uuid = ? AND uuid != ?', self.uuid_
was, self.uuid_was
).each do |c|
+ Collection.where('current_version_uuid = ? AND uuid != ?', self.uuid_
before_last_save, self.uuid_before_last_save
).each do |c|
c.attributes = updates
# Use a different validation context to skip the 'past_versions_cannot_be_updated'
# validator, as on this case it is legal to update some fields.
c.attributes = updates
# Use a different validation context to skip the 'past_versions_cannot_be_updated'
# validator, as on this case it is legal to update some fields.
@@
-624,10
+631,10
@@
class Collection < ArvadosModel
return
end
(managed_props.keys - self.properties.keys).each do |key|
return
end
(managed_props.keys - self.properties.keys).each do |key|
- if managed_props[key].has_key?('Value')
- self.properties[key] = managed_props[key]['Value']
- elsif managed_props[key]['Function'].andand == 'original_owner'
+ if managed_props[key]['Function'] == 'original_owner'
self.properties[key] = self.user_owner_uuid
self.properties[key] = self.user_owner_uuid
+ elsif managed_props[key]['Value']
+ self.properties[key] = managed_props[key]['Value']
else
logger.warn "Unidentified default property definition '#{key}': #{managed_props[key].inspect}"
end
else
logger.warn "Unidentified default property definition '#{key}': #{managed_props[key].inspect}"
end