Add optimistic lock to avoid race conditions when handling votes (#10196)

* Add optimistic lock to avoid race conditions when handling votes

* Force-reload polls when getting `ActiveRecord::StaleObjectError`

diff --git a/app/models/poll.rb b/app/models/poll.rb
index ab7236d455f9ab081b7f11b50e2d7b31b88bb644..da2e25e71529d2bf033a44e98039ade719b26c7e 100644 (file)
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -15,6 +15,7 @@
 #  last_fetched_at :datetime
 #  created_at      :datetime         not null
 #  updated_at      :datetime         not null
+#  lock_version    :integer          default(0), not null
 #
 
 class Poll < ApplicationRecord

diff --git a/app/models/poll_vote.rb b/app/models/poll_vote.rb
index 9ad66bbf8c21457e2b49855aa3707d252c017000..ad24eb6914a0e0ad2e54b3b3f7539ae79430bb01 100644 (file)
--- a/app/models/poll_vote.rb
+++ b/app/models/poll_vote.rb
@@ -32,5 +32,8 @@ class PollVote < ApplicationRecord
   def increment_counter_cache
     poll.cached_tallies[choice] = (poll.cached_tallies[choice] || 0) + 1
     poll.save
+  rescue ActiveRecord::StaleObjectError
+    poll.reload
+    retry
   end
 end

diff --git a/db/migrate/20190306145741_add_lock_version_to_polls.rb b/db/migrate/20190306145741_add_lock_version_to_polls.rb
new file mode 100644 (file)
index 0000000..cf50640
--- /dev/null
+++ b/db/migrate/20190306145741_add_lock_version_to_polls.rb
@@ -0,0 +1,6 @@
+class AddLockVersionToPolls < ActiveRecord::Migration[5.2]
+  def change
+    add_column :polls, :lock_version, :integer, null: false, default: 0
+  end
+end
+

diff --git a/db/schema.rb b/db/schema.rb
index 161619dcf5993c81d571429296cb6c1e2236306c..3d5260270932ec60b1ea74d6e96fc92fe84b7fc6 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_03_04_152020) do
+ActiveRecord::Schema.define(version: 2019_03_06_145741) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -464,6 +464,7 @@ ActiveRecord::Schema.define(version: 2019_03_04_152020) do
     t.datetime "last_fetched_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "lock_version", default: 0, null: false
     t.index ["account_id"], name: "index_polls_on_account_id"
     t.index ["status_id"], name: "index_polls_on_status_id"
   end