From 25d696162fda02c272a259c330193aad7041e897 Mon Sep 17 00:00:00 2001 From: Chen Zhang Date: Thu, 10 Jul 2025 17:02:52 -0400 Subject: [PATCH 1/2] Finalize BackfillSecurityFindingsProjectId Changelog: other --- .../backfill_security_findings_project_id.yml | 2 +- ...e_backfill_security_findings_project_id.rb | 20 +++++++++++++++++++ db/schema_migrations/20250710205206 | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 db/post_migrate/20250710205206_finalize_backfill_security_findings_project_id.rb create mode 100644 db/schema_migrations/20250710205206 diff --git a/db/docs/batched_background_migrations/backfill_security_findings_project_id.yml b/db/docs/batched_background_migrations/backfill_security_findings_project_id.yml index 9c0c87fb911436..3e4a3a1923e1a5 100644 --- a/db/docs/batched_background_migrations/backfill_security_findings_project_id.yml +++ b/db/docs/batched_background_migrations/backfill_security_findings_project_id.yml @@ -5,4 +5,4 @@ feature_category: vulnerability_management introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169121 milestone: '17.6' queued_migration_version: 20241014114624 -finalized_by: # version of the migration that finalized this BBM +finalized_by: '20250710205206' diff --git a/db/post_migrate/20250710205206_finalize_backfill_security_findings_project_id.rb b/db/post_migrate/20250710205206_finalize_backfill_security_findings_project_id.rb new file mode 100644 index 00000000000000..1f6086e8a2a406 --- /dev/null +++ b/db/post_migrate/20250710205206_finalize_backfill_security_findings_project_id.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +class FinalizeBackfillSecurityFindingsProjectId < Gitlab::Database::Migration[2.3] + milestone '18.2' + disable_ddl_transaction! + + restrict_gitlab_migration gitlab_schema: :gitlab_main_cell + + def up + ensure_batched_background_migration_is_finished( + job_class_name: 'BackfillSecurityFindingsProjectId', + table_name: :security_findings, + column_name: :id, + job_arguments: [:project_id, :vulnerability_scanners, :project_id, :scanner_id], + finalize: true + ) + end + + def down; end +end diff --git a/db/schema_migrations/20250710205206 b/db/schema_migrations/20250710205206 new file mode 100644 index 00000000000000..159594a3452b53 --- /dev/null +++ b/db/schema_migrations/20250710205206 @@ -0,0 +1 @@ +0f96d4d2b5524800fd2ee2230f9186559f83b994df73e07c2042926f8fa5daf5 \ No newline at end of file -- GitLab From 08f7b8134022a010116fc0309146c666614fd30b Mon Sep 17 00:00:00 2001 From: Chen Zhang Date: Mon, 14 Jul 2025 21:15:51 +0000 Subject: [PATCH 2/2] Edit 20250710205206_finalize_backfill_security_findings_project_id.rb --- ...0710205206_finalize_backfill_security_findings_project_id.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/post_migrate/20250710205206_finalize_backfill_security_findings_project_id.rb b/db/post_migrate/20250710205206_finalize_backfill_security_findings_project_id.rb index 1f6086e8a2a406..5388d39e6d59a0 100644 --- a/db/post_migrate/20250710205206_finalize_backfill_security_findings_project_id.rb +++ b/db/post_migrate/20250710205206_finalize_backfill_security_findings_project_id.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class FinalizeBackfillSecurityFindingsProjectId < Gitlab::Database::Migration[2.3] - milestone '18.2' + milestone '18.3' disable_ddl_transaction! restrict_gitlab_migration gitlab_schema: :gitlab_main_cell -- GitLab