From 783342d515756939d55c364f3bc148e6ad112e2e Mon Sep 17 00:00:00 2001
From: Maxime Orefice <morefice@gitlab.com>
Date: Wed, 8 Feb 2023 14:17:50 +0100
Subject: [PATCH 1/2] Fix partition_id for ci_job_artifacts

Changelog: fixed
---
 ...9_fix_partition_ids_for_ci_job_artifact.rb | 30 ++++++++++
 db/schema_migrations/20230208103009           |  1 +
 ..._partition_ids_for_ci_job_artifact_spec.rb | 58 +++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 db/post_migrate/20230208103009_fix_partition_ids_for_ci_job_artifact.rb
 create mode 100644 db/schema_migrations/20230208103009
 create mode 100644 spec/migrations/20230208103009_fix_partition_ids_for_ci_job_artifact_spec.rb

diff --git a/db/post_migrate/20230208103009_fix_partition_ids_for_ci_job_artifact.rb b/db/post_migrate/20230208103009_fix_partition_ids_for_ci_job_artifact.rb
new file mode 100644
index 00000000000000..a2a99c3826f7c8
--- /dev/null
+++ b/db/post_migrate/20230208103009_fix_partition_ids_for_ci_job_artifact.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class FixPartitionIdsForCiJobArtifact < Gitlab::Database::Migration[2.1]
+  MIGRATION = 'RebalancePartitionId'
+  DELAY_INTERVAL = 2.minutes.freeze
+  TABLE = :ci_job_artifacts
+  BATCH_SIZE = 5_000
+  SUB_BATCH_SIZE = 500
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_ci
+
+  def up
+    return unless Gitlab.com?
+
+    queue_batched_background_migration(
+      MIGRATION,
+      TABLE,
+      :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, :id, [])
+  end
+end
diff --git a/db/schema_migrations/20230208103009 b/db/schema_migrations/20230208103009
new file mode 100644
index 00000000000000..097184279f6898
--- /dev/null
+++ b/db/schema_migrations/20230208103009
@@ -0,0 +1 @@
+2f8fda2911fdbff0e7d0d90c6288c003e36471a6e107271227a6d67bda2775a0
\ No newline at end of file
diff --git a/spec/migrations/20230208103009_fix_partition_ids_for_ci_job_artifact_spec.rb b/spec/migrations/20230208103009_fix_partition_ids_for_ci_job_artifact_spec.rb
new file mode 100644
index 00000000000000..de2386c6a0d9b5
--- /dev/null
+++ b/spec/migrations/20230208103009_fix_partition_ids_for_ci_job_artifact_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe FixPartitionIdsForCiJobArtifact, migration: :gitlab_ci, feature_category: :continuous_integration do
+  let(:migration) { described_class::MIGRATION }
+
+  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_job_artifacts' do
+        migrate!
+
+        expect(migration).to have_scheduled_batched_migration(
+          gitlab_schema: :gitlab_ci,
+          table_name: :ci_job_artifacts,
+          column_name: :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 31b28eaf37889fda4944a56c2c6682ab133f2f9f Mon Sep 17 00:00:00 2001
From: Maxime Orefice <morefice@gitlab.com>
Date: Mon, 13 Feb 2023 11:00:00 +0100
Subject: [PATCH 2/2] Apply code review feedback

---
 .../20230208103009_fix_partition_ids_for_ci_job_artifact.rb     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/post_migrate/20230208103009_fix_partition_ids_for_ci_job_artifact.rb b/db/post_migrate/20230208103009_fix_partition_ids_for_ci_job_artifact.rb
index a2a99c3826f7c8..d1b256396380c6 100644
--- a/db/post_migrate/20230208103009_fix_partition_ids_for_ci_job_artifact.rb
+++ b/db/post_migrate/20230208103009_fix_partition_ids_for_ci_job_artifact.rb
@@ -2,7 +2,7 @@
 
 class FixPartitionIdsForCiJobArtifact < Gitlab::Database::Migration[2.1]
   MIGRATION = 'RebalancePartitionId'
-  DELAY_INTERVAL = 2.minutes.freeze
+  DELAY_INTERVAL = 2.minutes
   TABLE = :ci_job_artifacts
   BATCH_SIZE = 5_000
   SUB_BATCH_SIZE = 500
-- 
GitLab