Various optimisations and improvements

app/workers/update_merge_requests_worker.rb

@@ -9,8 +9,6 @@ class UpdateMergeRequestsWorker # rubocop:disable Scalability/IdempotentWorker
   weight 3
   loggable_arguments 2, 3, 4
 
-  LOG_TIME_THRESHOLD = 90 # seconds
-
   # rubocop: disable CodeReuse/ActiveRecord
   def perform(project_id, user_id, oldrev, newrev, ref)
     project = Project.find_by(id: project_id)

config/sidekiq_queues.yml

@@ -161,7 +161,7 @@
 - - merge_request_mergeability_check
   - 1
 - - merge_request_reset_approvals
-  - 3
+  - 1
 - - metrics_dashboard_prune_old_annotations
   - 1
 - - migrate_external_diffs

ee/app/workers/all_queues.yml

@@ -640,7 +640,7 @@
   :has_external_dependencies:
   :urgency: :high
   :resource_boundary: :cpu
-  :weight: 3
+  :weight: 1
   :idempotent:
   :tags: []
 - :name: new_epic

ee/app/workers/merge_request_reset_approvals_worker.rb

@@ -6,11 +6,8 @@ class MergeRequestResetApprovalsWorker # rubocop:disable Scalability/IdempotentW
   feature_category :source_code_management
   urgency :high
   worker_resource_boundary :cpu
-  weight 3
   loggable_arguments 2, 3
 
-  LOG_TIME_THRESHOLD = 90 # seconds
-
   # rubocop: disable CodeReuse/ActiveRecord
   def perform(project_id, user_id, ref, newrev)
     project = Project.find_by(id: project_id)

ee/spec/services/ee/merge_requests/refresh_service_spec.rb

@@ -343,7 +343,7 @@ RSpec.describe MergeRequests::RefreshService do
         Todo.where(action: Todo::APPROVAL_REQUIRED, target: merge_request)
       end
 
-      context 'push to origin repo source branch' do
+      context 'push to origin repo source branch', :sidekiq_inline do
         let(:notification_service) { spy('notification_service') }
 
         before do
@@ -354,7 +354,6 @@ RSpec.describe MergeRequests::RefreshService do
         it 'resets approvals' do
           service.execute(oldrev, newrev, 'refs/heads/master')
           reload_mrs
-          MergeRequestResetApprovalsWorker.drain
 
           expect(merge_request.approvals).to be_empty
           expect(forked_merge_request.approvals).not_to be_empty
@@ -446,14 +445,13 @@ RSpec.describe MergeRequests::RefreshService do
         end
       end
 
-      context 'resetting approvals if they are enabled' do
+      context 'resetting approvals if they are enabled', :sidekiq_inline do
         context 'when approvals_before_merge is disabled' do
           before do
             project.update(approvals_before_merge: 0)
             allow(service).to receive(:execute_hooks)
             service.execute(oldrev, newrev, 'refs/heads/master')
             reload_mrs
-            MergeRequestResetApprovalsWorker.drain
           end
 
           it 'resets approvals' do
@@ -490,14 +488,13 @@ RSpec.describe MergeRequests::RefreshService do
           end
         end
 
-        context 'when there are approvals' do
+        context 'when there are approvals', :sidekiq_inline do
           context 'closed merge request' do
             before do
               merge_request.close!
               allow(service).to receive(:execute_hooks)
               service.execute(oldrev, newrev, 'refs/heads/master')
               reload_mrs
-              MergeRequestResetApprovalsWorker.drain
             end
 
             it 'resets the approvals' do
@@ -511,7 +508,6 @@ RSpec.describe MergeRequests::RefreshService do
               allow(service).to receive(:execute_hooks)
               service.execute(oldrev, newrev, 'refs/heads/master')
               reload_mrs
-              MergeRequestResetApprovalsWorker.drain
             end
 
             it 'resets the approvals' do

ee/spec/services/ee/merge_requests/reset_approvals_service_spec.rb

@@ -3,9 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe EE::MergeRequests::ResetApprovalsService do
-  include ProjectForksHelper
-  include ProjectHelpers
-
   let(:service) { described_class.new(project, current_user) }
   let(:current_user) { merge_request.author }
   let(:group) { create(:group) }
@@ -34,7 +31,6 @@ RSpec.describe EE::MergeRequests::ResetApprovalsService do
 
   describe "#execute" do
     before do
-      merge_request.approvals.create!(user_id: user.id)
       allow(service).to receive(:execute_hooks)
       allow(NotificationService).to receive(:new) { notification_service }
       project.add_developer(approver)
@@ -42,6 +38,8 @@ RSpec.describe EE::MergeRequests::ResetApprovalsService do
       perform_enqueued_jobs do
         merge_request.update!(approver_ids: [approver].map(&:id).join(','))
       end
+
+      merge_request.approvals.create!(user_id: approver.id)
     end
 
     it 'resets approvals' do