From b6ae157cab1deb4a039518c5646c9d8f1d1571ff Mon Sep 17 00:00:00 2001 From: Chen Zhang Date: Thu, 10 Jul 2025 23:15:31 -0400 Subject: [PATCH 1/3] Finalize backfill migrations for scan_result_policies Changelog: other --- ...ckfill_scan_result_policies_project_id.yml | 2 +- ...ackfill_scan_result_policies_project_id.rb | 21 +++++++++++++++++++ ...kfill_scan_result_policies_namespace_id.rb | 21 +++++++++++++++++++ db/schema_migrations/20250711031222 | 1 + db/schema_migrations/20250711031250 | 1 + 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 db/post_migrate/20250711031222_finalize_backfill_scan_result_policies_project_id.rb create mode 100644 db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb create mode 100644 db/schema_migrations/20250711031222 create mode 100644 db/schema_migrations/20250711031250 diff --git a/db/docs/batched_background_migrations/backfill_scan_result_policies_project_id.yml b/db/docs/batched_background_migrations/backfill_scan_result_policies_project_id.yml index 0c2b136fc50392..7106059756a3be 100644 --- a/db/docs/batched_background_migrations/backfill_scan_result_policies_project_id.yml +++ b/db/docs/batched_background_migrations/backfill_scan_result_policies_project_id.yml @@ -5,4 +5,4 @@ feature_category: security_policy_management introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183125 milestone: '17.10' queued_migration_version: 20250301125534 -finalized_by: # version of the migration that finalized this BBM +finalized_by: '20250711031222' diff --git a/db/post_migrate/20250711031222_finalize_backfill_scan_result_policies_project_id.rb b/db/post_migrate/20250711031222_finalize_backfill_scan_result_policies_project_id.rb new file mode 100644 index 00000000000000..1b48f8441ce779 --- /dev/null +++ b/db/post_migrate/20250711031222_finalize_backfill_scan_result_policies_project_id.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class FinalizeBackfillScanResultPoliciesProjectId < 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: 'BackfillScanResultPoliciesProjectId', + table_name: :scan_result_policies, + column_name: :id, + job_arguments: [:project_id, :security_orchestration_policy_configurations, :project_id, + :security_orchestration_policy_configuration_id], + finalize: true + ) + end + + def down; end +end diff --git a/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb b/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb new file mode 100644 index 00000000000000..28c82da0f0dc49 --- /dev/null +++ b/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class FinalizeBackfillScanResultPoliciesNamespaceId < 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: 'BackfillScanResultPoliciesNamespaceId', + table_name: :scan_result_policies, + column_name: :id, + job_arguments: [:namespace_id, :security_orchestration_policy_configurations, :namespace_id, + :security_orchestration_policy_configuration_id], + finalize: true + ) + end + + def down; end +end diff --git a/db/schema_migrations/20250711031222 b/db/schema_migrations/20250711031222 new file mode 100644 index 00000000000000..51d8ff814944bc --- /dev/null +++ b/db/schema_migrations/20250711031222 @@ -0,0 +1 @@ +37c9b27b56354045b0d8bea53a104d3025e128a2e3d008d9c59308fa0e42af4c \ No newline at end of file diff --git a/db/schema_migrations/20250711031250 b/db/schema_migrations/20250711031250 new file mode 100644 index 00000000000000..165a2ab2730b49 --- /dev/null +++ b/db/schema_migrations/20250711031250 @@ -0,0 +1 @@ +a6ce034fb9acf16580eeae9127db9f1726a4ae6b21b2de832a41957a7619fb1d \ No newline at end of file -- GitLab From df631046e9c188e48685c429d7200c60f050a35c Mon Sep 17 00:00:00 2001 From: Chen Zhang Date: Mon, 14 Jul 2025 21:19:16 +0000 Subject: [PATCH 2/3] Update milestone to 18.3 --- ...1031222_finalize_backfill_scan_result_policies_project_id.rb | 2 +- ...31250_finalize_backfill_scan_result_policies_namespace_id.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db/post_migrate/20250711031222_finalize_backfill_scan_result_policies_project_id.rb b/db/post_migrate/20250711031222_finalize_backfill_scan_result_policies_project_id.rb index 1b48f8441ce779..ef9aa6b02144d5 100644 --- a/db/post_migrate/20250711031222_finalize_backfill_scan_result_policies_project_id.rb +++ b/db/post_migrate/20250711031222_finalize_backfill_scan_result_policies_project_id.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class FinalizeBackfillScanResultPoliciesProjectId < Gitlab::Database::Migration[2.3] - milestone '18.2' + milestone '18.3' disable_ddl_transaction! restrict_gitlab_migration gitlab_schema: :gitlab_main_cell diff --git a/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb b/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb index 28c82da0f0dc49..04dc3333a1b960 100644 --- a/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb +++ b/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class FinalizeBackfillScanResultPoliciesNamespaceId < Gitlab::Database::Migration[2.3] - milestone '18.2' + milestone '18.3' disable_ddl_transaction! restrict_gitlab_migration gitlab_schema: :gitlab_main_cell -- GitLab From 5ff03697b99001d8415a7165517b91e632e63cc9 Mon Sep 17 00:00:00 2001 From: Chen Zhang Date: Mon, 14 Jul 2025 18:52:02 -0400 Subject: [PATCH 3/3] Remove already finalized migration --- ...kfill_scan_result_policies_namespace_id.rb | 21 ------------------- db/schema_migrations/20250711031250 | 1 - 2 files changed, 22 deletions(-) delete mode 100644 db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb delete mode 100644 db/schema_migrations/20250711031250 diff --git a/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb b/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb deleted file mode 100644 index 04dc3333a1b960..00000000000000 --- a/db/post_migrate/20250711031250_finalize_backfill_scan_result_policies_namespace_id.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -class FinalizeBackfillScanResultPoliciesNamespaceId < Gitlab::Database::Migration[2.3] - milestone '18.3' - disable_ddl_transaction! - - restrict_gitlab_migration gitlab_schema: :gitlab_main_cell - - def up - ensure_batched_background_migration_is_finished( - job_class_name: 'BackfillScanResultPoliciesNamespaceId', - table_name: :scan_result_policies, - column_name: :id, - job_arguments: [:namespace_id, :security_orchestration_policy_configurations, :namespace_id, - :security_orchestration_policy_configuration_id], - finalize: true - ) - end - - def down; end -end diff --git a/db/schema_migrations/20250711031250 b/db/schema_migrations/20250711031250 deleted file mode 100644 index 165a2ab2730b49..00000000000000 --- a/db/schema_migrations/20250711031250 +++ /dev/null @@ -1 +0,0 @@ -a6ce034fb9acf16580eeae9127db9f1726a4ae6b21b2de832a41957a7619fb1d \ No newline at end of file -- GitLab