From 46f19372b317ded66975b3c8102cb0d177194279 Mon Sep 17 00:00:00 2001 From: Maxime Orefice Date: Thu, 9 Feb 2023 10:26:03 +0100 Subject: [PATCH 1/2] Fix partition_id for ci_build_trace_metadata Changelog: fixed --- ...rtition_ids_for_ci_build_trace_metadata.rb | 30 ++++++++++ db/schema_migrations/20230209092204 | 1 + ...on_ids_for_ci_build_trace_metadata_spec.rb | 60 +++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 db/post_migrate/20230209092204_fix_partition_ids_for_ci_build_trace_metadata.rb create mode 100644 db/schema_migrations/20230209092204 create mode 100644 spec/migrations/20230209092204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb diff --git a/db/post_migrate/20230209092204_fix_partition_ids_for_ci_build_trace_metadata.rb b/db/post_migrate/20230209092204_fix_partition_ids_for_ci_build_trace_metadata.rb new file mode 100644 index 00000000000000..25087dcbfa43d8 --- /dev/null +++ b/db/post_migrate/20230209092204_fix_partition_ids_for_ci_build_trace_metadata.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class FixPartitionIdsForCiBuildTraceMetadata < Gitlab::Database::Migration[2.1] + MIGRATION = 'RebalancePartitionId' + DELAY_INTERVAL = 2.minutes.freeze + TABLE = :ci_build_trace_metadata + BATCH_SIZE = 3_000 + SUB_BATCH_SIZE = 300 + + restrict_gitlab_migration gitlab_schema: :gitlab_ci + + def up + return unless Gitlab.com? + + queue_batched_background_migration( + MIGRATION, + TABLE, + :build_id, + job_interval: DELAY_INTERVAL, + batch_size: BATCH_SIZE, + sub_batch_size: SUB_BATCH_SIZE + ) + end + + def down + return unless Gitlab.com? + + delete_batched_background_migration(MIGRATION, TABLE, :build_id, []) + end +end diff --git a/db/schema_migrations/20230209092204 b/db/schema_migrations/20230209092204 new file mode 100644 index 00000000000000..c6432053853f08 --- /dev/null +++ b/db/schema_migrations/20230209092204 @@ -0,0 +1 @@ +f3962b71ec4b63a2e056872fc155ae4e41cdef8c989728b5e60553c6d602ccee \ No newline at end of file diff --git a/spec/migrations/20230209092204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb b/spec/migrations/20230209092204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb new file mode 100644 index 00000000000000..b232b82ef88986 --- /dev/null +++ b/spec/migrations/20230209092204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb @@ -0,0 +1,60 @@ +# frozen_string_literal: true + +require 'spec_helper' +require_migration! + +RSpec.describe FixPartitionIdsForCiBuildTraceMetadata, + migration: :gitlab_ci, + feature_category: :continuous_integration do + let(:migration) { described_class::MIGRATION } + + context 'when on sass' do + before do + allow(Gitlab).to receive(:com?).and_return(true) + end + + describe '#up' do + it 'schedules background jobs for each batch of ci_stages' do + migrate! + + expect(migration).to have_scheduled_batched_migration( + gitlab_schema: :gitlab_ci, + table_name: :ci_build_trace_metadata, + column_name: :build_id, + interval: described_class::DELAY_INTERVAL, + batch_size: described_class::BATCH_SIZE, + sub_batch_size: described_class::SUB_BATCH_SIZE + ) + end + end + + describe '#down' do + it 'deletes all batched migration records' do + migrate! + schema_migrate_down! + + expect(migration).not_to have_scheduled_batched_migration + end + end + end + + context 'when on self-managed instance' do + let(:migration) { described_class.new } + + describe '#up' do + it 'does not schedule background job' do + expect(migration).not_to receive(:queue_batched_background_migration) + + migration.up + end + end + + describe '#down' do + it 'does not delete background job' do + expect(migration).not_to receive(:delete_batched_background_migration) + + migration.down + end + end + end +end -- GitLab From 768ffbbea6a00274237df1337d235884d220a3be Mon Sep 17 00:00:00 2001 From: Maxime Orefice Date: Fri, 10 Feb 2023 12:23:20 +0100 Subject: [PATCH 2/2] Apply code review feedback --- ...2204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/migrations/20230209092204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb b/spec/migrations/20230209092204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb index b232b82ef88986..a93ba36d9ae4dc 100644 --- a/spec/migrations/20230209092204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb +++ b/spec/migrations/20230209092204_fix_partition_ids_for_ci_build_trace_metadata_spec.rb @@ -8,13 +8,13 @@ feature_category: :continuous_integration do let(:migration) { described_class::MIGRATION } - context 'when on sass' do + context 'when on saas' do before do allow(Gitlab).to receive(:com?).and_return(true) end describe '#up' do - it 'schedules background jobs for each batch of ci_stages' do + it 'schedules background jobs for each batch of ci_build_trace_metadata' do migrate! expect(migration).to have_scheduled_batched_migration( -- GitLab