From cb61d41c55bacb8300f611466d4d6efe6136553e Mon Sep 17 00:00:00 2001
From: Olaoluwa Oluro <olaoluro@gitlab.com>
Date: Tue, 15 Apr 2025 11:19:26 +0100
Subject: [PATCH] Finalize fork_networks organization_id backfill

The current query in postgress AI shows no new records are being
created with a NULL organization_id on fork networks: https://console.postgres.ai/gitlab/gitlab-production-main/sessions/38492/commands/118364

Changelog: other
---
 ...kfill_organization_id_on_fork_networks.yml |  2 +-
 ...ckfill_organization_id_on_fork_networks.rb | 20 +++++++++++++++++++
 db/schema_migrations/20250415100300           |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb
 create mode 100644 db/schema_migrations/20250415100300

diff --git a/db/docs/batched_background_migrations/backfill_organization_id_on_fork_networks.yml b/db/docs/batched_background_migrations/backfill_organization_id_on_fork_networks.yml
index 99325aee188f7d..7a894d7c06d134 100644
--- a/db/docs/batched_background_migrations/backfill_organization_id_on_fork_networks.yml
+++ b/db/docs/batched_background_migrations/backfill_organization_id_on_fork_networks.yml
@@ -5,4 +5,4 @@ feature_category: source_code_management
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/184051
 milestone: '17.11'
 queued_migration_version: 20250310143706
-finalized_by: # version of the migration that finalized this BBM
+finalized_by: 20250415100300
diff --git a/db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb b/db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb
new file mode 100644
index 00000000000000..32e870bf93903e
--- /dev/null
+++ b/db/post_migrate/20250415100300_finalize_backfill_organization_id_on_fork_networks.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class FinalizeBackfillOrganizationIdOnForkNetworks < Gitlab::Database::Migration[2.2]
+  milestone '18.0'
+  disable_ddl_transaction!
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+
+  def up
+    ensure_batched_background_migration_is_finished(
+      job_class_name: 'BackfillOrganizationIdOnForkNetworks',
+      table_name: :fork_networks,
+      column_name: :id,
+      job_arguments: [],
+      finalize: true
+    )
+  end
+
+  def down; end
+end
diff --git a/db/schema_migrations/20250415100300 b/db/schema_migrations/20250415100300
new file mode 100644
index 00000000000000..51f09451d97d11
--- /dev/null
+++ b/db/schema_migrations/20250415100300
@@ -0,0 +1 @@
+d0c3f38c39552dae2b9948174e29b47c6dd3202902924e2533a4553f35833c84
\ No newline at end of file
-- 
GitLab