class StuckMergeJobsWorker include Sidekiq::Worker include CronjobQueue def perform stuck_merge_requests.find_in_batches(batch_size: 100) do |group| jids = group.map(&:merge_jid) # Find the jobs that aren't currently running or that exceeded the threshold. completed_jids = Gitlab::SidekiqStatus.completed_jids(jids) if completed_jids.any? completed_ids = group.select { |merge_request| completed_jids.include?(merge_request.merge_jid) }.map(&:id) apply_current_state!(completed_jids, completed_ids) end end end private def apply_current_state!(completed_jids, completed_ids) merge_requests = MergeRequest.where(id: completed_ids) merge_requests.where.not(merge_commit_sha: nil).update_all(state: :merged) merge_requests.where(merge_commit_sha: nil).update_all(state: :opened) Rails.logger.info("Updated state of locked merge jobs. JIDs: #{completed_jids.join(', ')}") end def stuck_merge_requests MergeRequest.select('id, merge_jid').with_state(:locked).where.not(merge_jid: nil).reorder(nil) end end