From 75b3bc2615edc94bbf24fe4c81db896e6b5fe4eb Mon Sep 17 00:00:00 2001
From: Kerri Miller <kerrizor@kerrizor.com>
Date: Tue, 12 Apr 2022 05:27:56 +0000
Subject: [PATCH] Remove early exit to allow marking as complete
The early exit allowed some jobs to fail to be marked as complete.
Changelog: fixed
---
.../backfill_draft_status_on_merge_requests.rb | 2 --
...backfill_draft_status_on_merge_requests_spec.rb | 14 ++++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests.rb b/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests.rb
index b0a8c3a8cbb3..52ff3aaa4237 100644
--- a/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests.rb
+++ b/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests.rb
@@ -22,8 +22,6 @@ def self.eligible
def perform(start_id, end_id)
eligible_mrs = MergeRequest.eligible.where(id: start_id..end_id).pluck(:id)
- return if eligible_mrs.empty?
-
eligible_mrs.each_slice(10) do |slice|
MergeRequest.where(id: slice).update_all(draft: true)
end
diff --git a/spec/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests_spec.rb b/spec/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests_spec.rb
index 060477e1e89f..1158eedfe7c7 100644
--- a/spec/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests_spec.rb
+++ b/spec/lib/gitlab/background_migration/backfill_draft_status_on_merge_requests_spec.rb
@@ -50,5 +50,19 @@ def create_merge_request(params)
subject.perform(mr_ids.first, mr_ids.last)
end
+
+ it_behaves_like 'marks background migration job records' do
+ let!(:non_eligible_mrs) do
+ Array.new(2) do
+ create_merge_request(
+ title: "Not a d-r-a-f-t 1",
+ draft: false,
+ state_id: 1
+ )
+ end
+ end
+
+ let(:arguments) { [non_eligible_mrs.first.id, non_eligible_mrs.last.id] }
+ end
end
end
--
GitLab