Skip to content
Snippets Groups Projects
Commit 7b8783b4 authored by Z.J. van de Weg's avatar Z.J. van de Weg
Browse files

Revert "Cleanup projects which failed to delete"

This reverts commit 614baa86ac6dbd82a2e89800052f177ef7c7f3c5.
parent c51834d2
No related branches found
No related tags found
No related merge requests found
class CleanupPendingDeleteWorker
include Sidekiq::Worker
include CronjobQueue
MAX_NEW_JOBS = 256
sidekiq_options retry: false # this job auto-repeats via sidekiq-cron
def perform
admin = User.find_by(admin: true)
Group.with_deleted.where.not(deleted_at: nil).limit(MAX_NEW_JOBS).order(:deleted_at).each do |group|
GroupDestroyWorker.perform_async(group.id, admin.id)
end
Project.unscoped.where(pending_delete: true).limit(MAX_NEW_JOBS).order(:updated_at).each do |project|
ProjectDestroyWorker.perform_async(project.id, admin.id)
end
end
end
Loading
Loading
@@ -2,7 +2,7 @@ class ProjectDestroyWorker
include Sidekiq::Worker
include DedicatedSidekiqQueue
 
def perform(project_id, user_id, params = {})
def perform(project_id, user_id, params)
begin
project = Project.unscoped.find(project_id)
rescue ActiveRecord::RecordNotFound
Loading
Loading
Loading
Loading
@@ -312,10 +312,6 @@ Settings.cron_jobs['remove_unreferenced_lfs_objects_worker'] ||= Settingslogic.n
Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['cron'] ||= '20 0 * * *'
Settings.cron_jobs['remove_unreferenced_lfs_objects_worker']['job_class'] = 'RemoveUnreferencedLfsObjectsWorker'
 
Settings.cron_jobs['cleanup_pending_delete_worker'] ||= Settingslogic.new({})
Settings.cron_jobs['cleanup_pending_delete_worker']['cron'] = '25 */4 * * *'
Settings.cron_jobs['cleanup_pending_delete_worker']['job_class'] = 'CleanupPendingDeleteWorker'
#
# GitLab Shell
#
Loading
Loading
require 'spec_helper'
describe CleanupPendingDeleteWorker do
let!(:admin) { create(:admin) }
let(:project) { create(:empty_project, pending_delete: true) }
let(:group) { create(:group) }
subject { described_class.new }
describe "#perform" do
it "queues groups for deletion" do
# We can't set deleted_at on 1.week.ago because of acts_as_paranoid
group.destroy
expect(GroupDestroyWorker).to receive(:perform_async).with(group.id, admin.id)
subject.perform
end
it "queues projects for deletion" do
expect(ProjectDestroyWorker).to receive(:perform_async).with(project.id, admin.id)
subject.perform
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment