cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added locking around update and delete methods on main API objects. This should remove the 500 errors which come from concurrent overlapping updates. Experimental - might be too slow for production.

Browse source
This commit is contained in:
Matt Amos 2009-05-21 14:57:03 +00:00
parent 94c89838d4
commit 4ab495f5db
3 changed files with 50 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/models/relation.rb
View file

@ -240,6 +240,7 @@ class Relation < ActiveRecord::Base
# provide repeatable reads for the used-by checks. this means it
# shouldn't be possible to get race conditions.
Relation.transaction do
self.lock!
check_consistency(self, new_relation, user)
# This will check to see if this relation is used by another relation
rel = RelationMember.find(:first, :joins => :relation,
@ -255,16 +256,19 @@ class Relation < ActiveRecord::Base
end
def update_from(new_relation, user)
check_consistency(self, new_relation, user)
unless new_relation.preconditions_ok?(self.members)
raise OSM::APIPreconditionFailedError.new("Cannot update relation #{self.id}: data or member data is invalid.")
Relation.transaction do
self.lock!
check_consistency(self, new_relation, user)
unless new_relation.preconditions_ok?(self.members)
raise OSM::APIPreconditionFailedError.new("Cannot update relation #{self.id}: data or member data is invalid.")
end
self.changeset_id = new_relation.changeset_id
self.changeset = new_relation.changeset
self.tags = new_relation.tags
self.members = new_relation.members
self.visible = true
save_with_history!
end
self.changeset_id = new_relation.changeset_id
self.changeset = new_relation.changeset
self.tags = new_relation.tags
self.members = new_relation.members
self.visible = true
save_with_history!
end
def create_with_history(user)