From faac37e40296c64114313c817400a377c34ba8ea Mon Sep 17 00:00:00 2001
From: Marius Bobin <mbobin@gitlab.com>
Date: Mon, 6 Feb 2023 14:59:06 +0200
Subject: [PATCH 1/2] Fix partition ids for ci_job_variables records

Changelog: other
---
 ..._fix_partition_ids_for_ci_job_variables.rb | 23 +++++++++
 db/schema_migrations/20230214122717           |  1 +
 ...partition_ids_for_ci_job_variables_spec.rb | 51 +++++++++++++++++++
 3 files changed, 75 insertions(+)
 create mode 100644 db/post_migrate/20230214122717_fix_partition_ids_for_ci_job_variables.rb
 create mode 100644 db/schema_migrations/20230214122717
 create mode 100644 spec/migrations/20230214122717_fix_partition_ids_for_ci_job_variables_spec.rb

diff --git a/db/post_migrate/20230214122717_fix_partition_ids_for_ci_job_variables.rb b/db/post_migrate/20230214122717_fix_partition_ids_for_ci_job_variables.rb
new file mode 100644
index 00000000000000..6922872b5b4593
--- /dev/null
+++ b/db/post_migrate/20230214122717_fix_partition_ids_for_ci_job_variables.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class FixPartitionIdsForCiJobVariables < Gitlab::Database::Migration[2.1]
+  disable_ddl_transaction!
+  restrict_gitlab_migration gitlab_schema: :gitlab_ci
+
+  BATCH_SIZE = 250
+
+  def up
+    return unless Gitlab.com?
+
+    define_batchable_model(:ci_job_variables)
+      .where(partition_id: 101)
+      .each_batch(of: BATCH_SIZE) do |batch|
+        batch.update_all(partition_id: 100)
+        sleep 0.1
+      end
+  end
+
+  def down
+    # no-op
+  end
+end
diff --git a/db/schema_migrations/20230214122717 b/db/schema_migrations/20230214122717
new file mode 100644
index 00000000000000..6f69502caa3def
--- /dev/null
+++ b/db/schema_migrations/20230214122717
@@ -0,0 +1 @@
+803a4aa4c28aecf498d2a70046850d8128327feb12fe1a42f1255cd08da7746e
\ No newline at end of file
diff --git a/spec/migrations/20230214122717_fix_partition_ids_for_ci_job_variables_spec.rb b/spec/migrations/20230214122717_fix_partition_ids_for_ci_job_variables_spec.rb
new file mode 100644
index 00000000000000..64275855262100
--- /dev/null
+++ b/spec/migrations/20230214122717_fix_partition_ids_for_ci_job_variables_spec.rb
@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require_migration!
+
+RSpec.describe FixPartitionIdsForCiJobVariables, migration: :gitlab_ci, feature_category: :continuous_integration do
+  let(:builds) { table(:ci_builds, database: :ci) }
+  let(:job_variables) { table(:ci_job_variables, database: :ci) }
+  let(:connection) { job_variables.connection }
+
+  around do |example|
+    connection.execute "ALTER TABLE #{job_variables.quoted_table_name} DISABLE TRIGGER ALL;"
+
+    example.run
+  ensure
+    connection.execute "ALTER TABLE #{job_variables.quoted_table_name} ENABLE TRIGGER ALL;"
+  end
+
+  before do
+    job = builds.create!(partition_id: 100)
+
+    job_variables.insert_all!([
+      { job_id: job.id, partition_id: 100, key: 'variable-100' },
+      { job_id: job.id, partition_id: 101, key: 'variable-101' }
+    ])
+  end
+
+  describe '#up', :aggregate_failures do
+    context 'when on sass' do
+      before do
+        allow(Gitlab).to receive(:com?).and_return(true)
+      end
+
+      it 'fixes partition_id' do
+        expect { migrate! }.not_to raise_error
+
+        expect(job_variables.where(partition_id: 100).count).to eq(2)
+        expect(job_variables.where(partition_id: 101).count).to eq(0)
+      end
+    end
+
+    context 'when on self managed' do
+      it 'does not change partition_id' do
+        expect { migrate! }.not_to raise_error
+
+        expect(job_variables.where(partition_id: 100).count).to eq(1)
+        expect(job_variables.where(partition_id: 101).count).to eq(1)
+      end
+    end
+  end
+end
-- 
GitLab


From 85cc6e83c10ba1649052456e9d46eec6ff38886c Mon Sep 17 00:00:00 2001
From: Marius Bobin <mbobin@gitlab.com>
Date: Thu, 16 Feb 2023 12:59:57 +0200
Subject: [PATCH 2/2] Apply review feedback

---
 .../20230214122717_fix_partition_ids_for_ci_job_variables.rb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/post_migrate/20230214122717_fix_partition_ids_for_ci_job_variables.rb b/db/post_migrate/20230214122717_fix_partition_ids_for_ci_job_variables.rb
index 6922872b5b4593..0a201c514674b5 100644
--- a/db/post_migrate/20230214122717_fix_partition_ids_for_ci_job_variables.rb
+++ b/db/post_migrate/20230214122717_fix_partition_ids_for_ci_job_variables.rb
@@ -4,7 +4,7 @@ class FixPartitionIdsForCiJobVariables < Gitlab::Database::Migration[2.1]
   disable_ddl_transaction!
   restrict_gitlab_migration gitlab_schema: :gitlab_ci
 
-  BATCH_SIZE = 250
+  BATCH_SIZE = 50
 
   def up
     return unless Gitlab.com?
-- 
GitLab