Merge branch '429361-requeue-backfill' into 'master'

Fix bg migration and requeue backfill migration for remediations

See merge request !135747



Merged-by: Hordur Freyr Yngvason <hfyngvason@gitlab.com>
Approved-by: Michael Becker <11881043-wandering_person@users.noreply.gitlab.com>
Approved-by: Michał Zając <mzajac@gitlab.com>
Approved-by: Hordur Freyr Yngvason <hfyngvason@gitlab.com>
Reviewed-by: Michał Zając <mzajac@gitlab.com>
Reviewed-by: Michael Becker <11881043-wandering_person@users.noreply.gitlab.com>
Co-authored-by: Subashis <schakraborty@gitlab.com>

db/docs/batched_background_migrations/backfill_has_remediations_of_vulnerability_reads.yml

 ---
 migration_job_name: BackfillHasRemediationsOfVulnerabilityReads
-description: Backfills has_remediations column for vulnerability_reads table.
+description: Backfills has_remediations column for vulnerability_reads table. 
+  Originally introduced via https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133714
+  RE-ran because there was a error in remediation ingestion logic.
 feature_category: database
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/133714
-milestone: 16.5
+milestone: 16.7
 queued_migration_version: 20231011142714

db/post_migrate/20231011142714_queue_backfill_has_remediations_of_vulnerability_reads.rb

@@ -9,19 +9,15 @@ class QueueBackfillHasRemediationsOfVulnerabilityReads < Gitlab::Database::Migra
   restrict_gitlab_migration gitlab_schema: :gitlab_main
   disable_ddl_transaction!
 
-  def up
-    queue_batched_background_migration(
-      MIGRATION,
-      :vulnerability_reads,
-      :vulnerability_id,
-      job_interval: DELAY_INTERVAL,
-      queued_migration_version: '20231011142714',
-      batch_size: BATCH_SIZE,
-      sub_batch_size: SUB_BATCH_SIZE
-    )
-  end
+  # per: https://docs.gitlab.com/ee/development/database/batched_background_migrations.html#requeuing-batched-background-migrations
+  # > When you requeue the batched background migration, turn the original queuing
+  # > into a no-op by clearing up the #up and #down methods of the migration
+  # > performing the requeuing. Otherwise, the batched background migration is
+  # > queued multiple times on systems that are upgrading multiple patch releases
+  # > at once.
+  #
+  # being re-run via https://gitlab.com/gitlab-org/gitlab/-/merge_requests/135747
+  def up; end
 
-  def down
-    delete_batched_background_migration(MIGRATION, :vulnerability_reads, :vulnerability_id, [])
-  end
+  def down; end
 end

db/post_migrate/20231031204841_requeue_backfill_has_remediations_of_vulnerability_reads.rb

+# frozen_string_literal: true
+
+# rubocop: disable BackgroundMigration/DictionaryFile -- queued/introduced before the rule is introduced
+
+class RequeueBackfillHasRemediationsOfVulnerabilityReads < Gitlab::Database::Migration[2.2]
+  milestone '16.7'
+
+  MIGRATION = "BackfillHasRemediationsOfVulnerabilityReads"
+  DELAY_INTERVAL = 2.minutes
+  BATCH_SIZE = 10_000
+  SUB_BATCH_SIZE = 50
+
+  restrict_gitlab_migration gitlab_schema: :gitlab_main
+  disable_ddl_transaction!
+
+  def up
+    queue_batched_background_migration(
+      MIGRATION,
+      :vulnerability_reads,
+      :vulnerability_id,
+      job_interval: DELAY_INTERVAL,
+      queued_migration_version: '20231031204841',
+      batch_size: BATCH_SIZE,
+      sub_batch_size: SUB_BATCH_SIZE
+    )
+  end
+
+  def down
+    delete_batched_background_migration(MIGRATION, :vulnerability_reads, :vulnerability_id, [])
+  end
+end
+# rubocop: enable BackgroundMigration/DictionaryFile

db/schema_migrations/20231031204841

+a1bbcd9430acc48bc271dd041c2999932d24d15bfa2ef8766d7bf9920d2d3539
\ No newline at end of file

lib/gitlab/background_migration/backfill_has_remediations_of_vulnerability_reads.rb

@@ -20,6 +20,8 @@ class BackfillHasRemediationsOfVulnerabilityReads < BatchedMigrationJob
 
       def perform
         each_sub_batch do |sub_batch|
+          reset_has_remediations_attribute(sub_batch)
+
           update_query = update_query_for(sub_batch)
 
           connection.execute(update_query)
@@ -28,6 +30,10 @@ def perform
 
       private
 
+      def reset_has_remediations_attribute(sub_batch)
+        sub_batch.update_all(has_remediations: false)
+      end
+
       def update_query_for(sub_batch)
         subquery = sub_batch.joins("
           INNER JOIN vulnerability_occurrences ON

spec/migrations/20231011142714_queue_backfill_has_remediations_of_vulnerability_reads_spec.rb → spec/migrations/20231031204841_requeue_backfill_has_remediations_of_vulnerability_reads_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 require_migration!
 
-RSpec.describe QueueBackfillHasRemediationsOfVulnerabilityReads, feature_category: :database do
+RSpec.describe RequeueBackfillHasRemediationsOfVulnerabilityReads, feature_category: :database do
   let!(:batched_migration) { described_class::MIGRATION }
 
   it 'schedules a new batched migration' do