diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-02-08 14:22:04 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-02-08 14:22:04 +0300 |
commit | 07e1bcc0768d74b85135a2dff1d7cd3afd13f6de (patch) | |
tree | 0619790b5373fb38d84cb56edb9e4137e1679dd2 /lib | |
parent | 297b075bd7d3f6a2703ee8dd6c30ac05400e31a3 (diff) | |
parent | 917fb1744c10cdddd50c22bda690dfcca9a47eff (diff) |
Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'
Fix concurrent fork network migrations
Closes #41487
See merge request gitlab-org/gitlab-ce!16988
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/background_migration/create_fork_network_memberships_range.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/gitlab/background_migration/create_fork_network_memberships_range.rb b/lib/gitlab/background_migration/create_fork_network_memberships_range.rb index 03b17b319fa..1b4a9e8a194 100644 --- a/lib/gitlab/background_migration/create_fork_network_memberships_range.rb +++ b/lib/gitlab/background_migration/create_fork_network_memberships_range.rb @@ -14,6 +14,14 @@ module Gitlab def perform(start_id, end_id) log("Creating memberships for forks: #{start_id} - #{end_id}") + insert_members(start_id, end_id) + + if missing_members?(start_id, end_id) + BackgroundMigrationWorker.perform_in(RESCHEDULE_DELAY, "CreateForkNetworkMembershipsRange", [start_id, end_id]) + end + end + + def insert_members(start_id, end_id) ActiveRecord::Base.connection.execute <<~INSERT_MEMBERS INSERT INTO fork_network_members (fork_network_id, project_id, forked_from_project_id) @@ -33,10 +41,9 @@ module Gitlab WHERE existing_members.project_id = forked_project_links.forked_to_project_id ) INSERT_MEMBERS - - if missing_members?(start_id, end_id) - BackgroundMigrationWorker.perform_in(RESCHEDULE_DELAY, "CreateForkNetworkMembershipsRange", [start_id, end_id]) - end + rescue ActiveRecord::RecordNotUnique => e + # `fork_network_member` was created concurrently in another migration + log(e.message) end def missing_members?(start_id, end_id) |