diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-23 13:37:32 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-11-23 13:37:32 +0100 |
| commit | 3dfbfa4e4f2ce962660dc534ac7a8c670049b506 (patch) | |
| tree | f912819b85c0d680a1f42913576cb7bb642ea38b | |
| parent | 1143411ae848fade4050d3d8319ba5ed88a1b1da (diff) | |
| download | gitlab-ce-3dfbfa4e4f2ce962660dc534ac7a8c670049b506.tar.gz | |
Adjust batch size for migrating runners token
| -rw-r--r-- | db/post_migrate/20181121111200_schedule_runners_token_encryption.rb | 4 | ||||
| -rw-r--r-- | spec/migrations/schedule_runners_token_encryption_spec.rb | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/db/post_migrate/20181121111200_schedule_runners_token_encryption.rb b/db/post_migrate/20181121111200_schedule_runners_token_encryption.rb index 3a59217f07a..753e052f7a7 100644 --- a/db/post_migrate/20181121111200_schedule_runners_token_encryption.rb +++ b/db/post_migrate/20181121111200_schedule_runners_token_encryption.rb @@ -5,7 +5,7 @@ class ScheduleRunnersTokenEncryption < ActiveRecord::Migration DOWNTIME = false BATCH_SIZE = 10000 - RANGE_SIZE = 100 + RANGE_SIZE = 2000 MIGRATION = 'EncryptRunnersTokens' MODELS = [ @@ -20,7 +20,7 @@ class ScheduleRunnersTokenEncryption < ActiveRecord::Migration def up MODELS.each do |model| model.each_batch(of: BATCH_SIZE) do |relation, index| - delay = index * 2.minutes + delay = index * 4.minutes relation.each_batch(of: RANGE_SIZE) do |relation| range = relation.pluck('MIN(id)', 'MAX(id)').first diff --git a/spec/migrations/schedule_runners_token_encryption_spec.rb b/spec/migrations/schedule_runners_token_encryption_spec.rb index a1e4d36de1c..376d2795277 100644 --- a/spec/migrations/schedule_runners_token_encryption_spec.rb +++ b/spec/migrations/schedule_runners_token_encryption_spec.rb @@ -24,13 +24,13 @@ describe ScheduleRunnersTokenEncryption, :migration do Timecop.freeze do migrate! - expect(described_class::MIGRATION).to be_scheduled_delayed_migration(2.minutes, 'settings', 1, 1) - expect(described_class::MIGRATION).to be_scheduled_delayed_migration(2.minutes, 'namespace', 11, 11) - expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'namespace', 12, 12) - expect(described_class::MIGRATION).to be_scheduled_delayed_migration(2.minutes, 'project', 111, 111) - expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'project', 114, 114) - expect(described_class::MIGRATION).to be_scheduled_delayed_migration(2.minutes, 'runner', 201, 201) - expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'runner', 202, 202) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'settings', 1, 1) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'namespace', 11, 11) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(8.minutes, 'namespace', 12, 12) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'project', 111, 111) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(8.minutes, 'project', 114, 114) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(4.minutes, 'runner', 201, 201) + expect(described_class::MIGRATION).to be_scheduled_delayed_migration(8.minutes, 'runner', 202, 202) expect(BackgroundMigrationWorker.jobs.size).to eq 7 end end |