Merge branch 'fix-issue-3067' into 'master'

Fix nonatomic database update potentially causing project star counts to go negative The `counter_cache` decrement function is called when a project star is deleted, but there was no guarantee multiple workers would not attempt to delete the same item simultaneously. Use an atomic update to prevent the count from going negative. Note: I was only able to duplicate the issue on GitLab.com, but I haven't been able to replicate it anywhere else. Presumably this bug happens when the `WHERE` clause takes some time to search for the right entry and multiple requests get sent simultaneously. Need to verify whether this fix truly solves the issue. Closes #3067 See merge request !1628

Merge branch 'fix-issue-3067' into 'master'
64c2bccd · Dmitriy Zaporozhets · 5ad3a274 · ca3ce5c2 · 64c2bccd · 64c2bccd
Commit 64c2bccd authored Oct 17, 2015 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

user.rb app/models/user.rb +4 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.2.0 (unreleased)
  - Highlight comment based on anchor in URL

 v 8.1.0 (unreleased)
+  - Fix nonatomic database update potentially causing project star counts to go negative (Stan Hu)
  - Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu)
  - Speed up load times of issue detail pages by roughly 1.5x
  - Add a system note and update relevant merge requests when a branch is deleted or re-added (Stan Hu)

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -706,14 +706,17 @@ class User < ActiveRecord::Base
  end

  def toggle_star(project)
+    UsersStarProject.transaction do
      user_star_project = users_star_projects.
-      where(project: project, user: self).take
+          where(project: project, user: self).lock(true).first
+
      if user_star_project
        user_star_project.destroy
      else
        UsersStarProject.create!(project: project, user: self)
      end
    end
+  end

  def manageable_namespaces
    @manageable_namespaces ||= [namespace] + owned_groups + masters_groups