diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-02-08 14:22:04 +0300 |
|---|---|---|
| committer | Ian Baum <ibaum@gitlab.com> | 2018-02-12 20:19:41 +0300 |
| commit | 23501137a6b15acd70fceda20267b8db1cde89b5 (patch) | |
| tree | ea7430944ba4db4f7b71a7e3dacc67d3d3b56525 /db | |
| parent | 466d93d663519e02fbc8cd3ff4b66c97c73e94c5 (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 'db')
| -rw-r--r-- | db/migrate/20170929131201_populate_fork_networks.rb | 16 | ||||
| -rw-r--r-- | db/post_migrate/20171124150326_reschedule_fork_network_creation.rb | 16 |
2 files changed, 2 insertions, 30 deletions
diff --git a/db/migrate/20170929131201_populate_fork_networks.rb b/db/migrate/20170929131201_populate_fork_networks.rb index 1214962770f..ddbf27e1852 100644 --- a/db/migrate/20170929131201_populate_fork_networks.rb +++ b/db/migrate/20170929131201_populate_fork_networks.rb @@ -6,22 +6,8 @@ class PopulateForkNetworks < ActiveRecord::Migration DOWNTIME = false - MIGRATION = 'PopulateForkNetworksRange'.freeze - BATCH_SIZE = 100 - DELAY_INTERVAL = 15.seconds - - disable_ddl_transaction! - - class ForkedProjectLink < ActiveRecord::Base - include EachBatch - - self.table_name = 'forked_project_links' - end - def up - say 'Populating the `fork_networks` based on existing `forked_project_links`' - - queue_background_migration_jobs_by_range_at_intervals(ForkedProjectLink, MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE) + say 'Fork networks will be populated in 20171205190711 - RescheduleForkNetworkCreationCaller' end def down diff --git a/db/post_migrate/20171124150326_reschedule_fork_network_creation.rb b/db/post_migrate/20171124150326_reschedule_fork_network_creation.rb index 05430efe1f6..26f917d5a1e 100644 --- a/db/post_migrate/20171124150326_reschedule_fork_network_creation.rb +++ b/db/post_migrate/20171124150326_reschedule_fork_network_creation.rb @@ -3,22 +3,8 @@ class RescheduleForkNetworkCreation < ActiveRecord::Migration DOWNTIME = false - MIGRATION = 'PopulateForkNetworksRange'.freeze - BATCH_SIZE = 100 - DELAY_INTERVAL = 15.seconds - - disable_ddl_transaction! - - class ForkedProjectLink < ActiveRecord::Base - include EachBatch - - self.table_name = 'forked_project_links' - end - def up - say 'Populating the `fork_networks` based on existing `forked_project_links`' - - queue_background_migration_jobs_by_range_at_intervals(ForkedProjectLink, MIGRATION, DELAY_INTERVAL, batch_size: BATCH_SIZE) + say 'Fork networks will be populated in 20171205190711 - RescheduleForkNetworkCreationCaller' end def down |