Merge branch '322393-fj-remove-old-compatibility-clasess-storage-worker' into 'master'

Remove old storage compatibility classes

See merge request gitlab-org/gitlab!61893

app/models/project_repository_storage_move.rb

-# frozen_string_literal: true
-
-# This is a compatibility class to avoid calling a non-existent
-# class from sidekiq during deployment.
-#
-# This class was moved to a namespace in https://gitlab.com/gitlab-org/gitlab/-/issues/299853.
-# we cannot remove this class entirely because there can be jobs
-# referencing it.
-#
-# We can get rid of this class in 14.0
-# https://gitlab.com/gitlab-org/gitlab/-/issues/322393
-class ProjectRepositoryStorageMove < Projects::RepositoryStorageMove
-end

app/models/snippet_repository_storage_move.rb

-# frozen_string_literal: true
-
-# This is a compatibility class to avoid calling a non-existent
-# class from sidekiq during deployment.
-#
-# This class was moved to a namespace in https://gitlab.com/gitlab-org/gitlab/-/issues/299853.
-# we cannot remove this class entirely because there can be jobs
-# referencing it.
-#
-# We can get rid of this class in 14.0
-# https://gitlab.com/gitlab-org/gitlab/-/issues/322393
-class SnippetRepositoryStorageMove < Snippets::RepositoryStorageMove
-end

app/workers/all_queues.yml

@@ -2570,15 +2570,6 @@
   :weight: 1
   :idempotent:
   :tags: []
-- :name: project_schedule_bulk_repository_shard_moves
-  :worker_name: ProjectScheduleBulkRepositoryShardMovesWorker
-  :feature_category: :gitaly
-  :has_external_dependencies:
-  :urgency: :throttled
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent: true
-  :tags: []
 - :name: project_service
   :worker_name: ProjectServiceWorker
   :feature_category: :integrations
@@ -2588,15 +2579,6 @@
   :weight: 1
   :idempotent:
   :tags: []
-- :name: project_update_repository_storage
-  :worker_name: ProjectUpdateRepositoryStorageWorker
-  :feature_category: :gitaly
-  :has_external_dependencies:
-  :urgency: :throttled
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent: true
-  :tags: []
 - :name: projects_git_garbage_collect
   :worker_name: Projects::GitGarbageCollectWorker
   :feature_category: :gitaly
@@ -2811,24 +2793,6 @@
   :weight: 1
   :idempotent:
   :tags: []
-- :name: snippet_schedule_bulk_repository_shard_moves
-  :worker_name: SnippetScheduleBulkRepositoryShardMovesWorker
-  :feature_category: :gitaly
-  :has_external_dependencies:
-  :urgency: :throttled
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent: true
-  :tags: []
-- :name: snippet_update_repository_storage
-  :worker_name: SnippetUpdateRepositoryStorageWorker
-  :feature_category: :gitaly
-  :has_external_dependencies:
-  :urgency: :throttled
-  :resource_boundary: :unknown
-  :weight: 1
-  :idempotent: true
-  :tags: []
 - :name: snippets_schedule_bulk_repository_shard_moves
   :worker_name: Snippets::ScheduleBulkRepositoryShardMovesWorker
   :feature_category: :gitaly

app/workers/project_schedule_bulk_repository_shard_moves_worker.rb

-# frozen_string_literal: true
-
-# This is a compatibility class to avoid calling a non-existent
-# class from sidekiq during deployment.
-#
-# This class was moved to a namespace in https://gitlab.com/gitlab-org/gitlab/-/issues/299853.
-# we cannot remove this class entirely because there can be jobs
-# referencing it.
-#
-# We can get rid of this class in 14.0
-# https://gitlab.com/gitlab-org/gitlab/-/issues/322393
-class ProjectScheduleBulkRepositoryShardMovesWorker < Projects::ScheduleBulkRepositoryShardMovesWorker
-  idempotent!
-  urgency :throttled
-end

app/workers/project_update_repository_storage_worker.rb

-# frozen_string_literal: true
-
-# This is a compatibility class to avoid calling a non-existent
-# class from sidekiq during deployment.
-#
-# This class was moved to a namespace in https://gitlab.com/gitlab-org/gitlab/-/issues/299853.
-# we cannot remove this class entirely because there can be jobs
-# referencing it.
-#
-# We can get rid of this class in 14.0
-# https://gitlab.com/gitlab-org/gitlab/-/issues/322393
-class ProjectUpdateRepositoryStorageWorker < Projects::UpdateRepositoryStorageWorker
-  idempotent!
-  urgency :throttled
-end

app/workers/snippet_schedule_bulk_repository_shard_moves_worker.rb

-# frozen_string_literal: true
-
-# This is a compatibility class to avoid calling a non-existent
-# class from sidekiq during deployment.
-#
-# This class was moved to a namespace in https://gitlab.com/gitlab-org/gitlab/-/issues/299853.
-# we cannot remove this class entirely because there can be jobs
-# referencing it.
-#
-# We can get rid of this class in 14.0
-# https://gitlab.com/gitlab-org/gitlab/-/issues/322393
-class SnippetScheduleBulkRepositoryShardMovesWorker < Snippets::ScheduleBulkRepositoryShardMovesWorker
-  idempotent!
-  feature_category :gitaly
-  urgency :throttled
-end

app/workers/snippet_update_repository_storage_worker.rb

-# frozen_string_literal: true
-
-# This is a compatibility class to avoid calling a non-existent
-# class from sidekiq during deployment.
-#
-# This class was moved to a namespace in https://gitlab.com/gitlab-org/gitlab/-/issues/299853.
-# we cannot remove this class entirely because there can be jobs
-# referencing it.
-#
-# We can get rid of this class in 14.0
-# https://gitlab.com/gitlab-org/gitlab/-/issues/322393
-class SnippetUpdateRepositoryStorageWorker < Snippets::UpdateRepositoryStorageWorker # rubocop:disable Scalability/IdempotentWorker
-  idempotent!
-  urgency :throttled
-end

config/sidekiq_queues.yml

@@ -298,14 +298,10 @@
   - 1
 - - project_import_schedule
   - 1
-- - project_schedule_bulk_repository_shard_moves
-  - 1
 - - project_service
   - 1
 - - project_template_export
   - 1
-- - project_update_repository_storage
-  - 1
 - - projects_git_garbage_collect
   - 1
 - - projects_post_creation
@@ -370,10 +366,6 @@
   - 1
 - - set_user_status_based_on_user_cap_setting
   - 1
-- - snippet_schedule_bulk_repository_shard_moves
-  - 1
-- - snippet_update_repository_storage
-  - 1
 - - snippets_schedule_bulk_repository_shard_moves
   - 1
 - - snippets_update_repository_storage

spec/models/project_repository_storage_move_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ProjectRepositoryStorageMove, type: :model do
-  let_it_be_with_refind(:project) { create(:project) }
-
-  it_behaves_like 'handles repository moves' do
-    let(:container) { project }
-    let(:repository_storage_factory_key) { :project_repository_storage_move }
-    let(:error_key) { :project }
-    let(:repository_storage_worker) { Projects::UpdateRepositoryStorageWorker }
-  end
-
-  describe 'state transitions' do
-    let(:storage) { 'test_second_storage' }
-
-    before do
-      stub_storage_settings(storage => { 'path' => 'tmp/tests/extra_storage' })
-    end
-
-    context 'when started' do
-      subject(:storage_move) { create(:project_repository_storage_move, :started, container: project, destination_storage_name: storage) }
-
-      context 'and transits to replicated' do
-        it 'sets the repository storage and marks the container as writable' do
-          storage_move.finish_replication!
-
-          expect(project.repository_storage).to eq(storage)
-          expect(project).not_to be_repository_read_only
-        end
-      end
-    end
-  end
-end

spec/models/snippet_repository_storage_move_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe SnippetRepositoryStorageMove, type: :model do
-  it_behaves_like 'handles repository moves' do
-    let_it_be_with_refind(:container) { create(:snippet) }
-
-    let(:repository_storage_factory_key) { :snippet_repository_storage_move }
-    let(:error_key) { :snippet }
-    let(:repository_storage_worker) { Snippets::UpdateRepositoryStorageWorker }
-  end
-end

spec/workers/project_schedule_bulk_repository_shard_moves_worker_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ProjectScheduleBulkRepositoryShardMovesWorker do
-  it_behaves_like 'schedules bulk repository shard moves' do
-    let_it_be_with_reload(:container) { create(:project, :repository) }
-
-    let(:move_service_klass) { Projects::RepositoryStorageMove }
-    let(:worker_klass) { Projects::UpdateRepositoryStorageWorker }
-  end
-end

spec/workers/project_update_repository_storage_worker_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ProjectUpdateRepositoryStorageWorker do
-  subject { described_class.new }
-
-  it_behaves_like 'an update storage move worker' do
-    let_it_be_with_refind(:container) { create(:project, :repository) }
-    let_it_be(:repository_storage_move) { create(:project_repository_storage_move) }
-
-    let(:service_klass) { Projects::UpdateRepositoryStorageService }
-    let(:repository_storage_move_klass) { Projects::RepositoryStorageMove }
-  end
-end

spec/workers/snippet_schedule_bulk_repository_shard_moves_worker_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe SnippetScheduleBulkRepositoryShardMovesWorker do
-  it_behaves_like 'schedules bulk repository shard moves' do
-    let_it_be_with_reload(:container) { create(:snippet, :repository).tap { |snippet| snippet.create_repository } }
-
-    let(:move_service_klass) { Snippets::RepositoryStorageMove }
-    let(:worker_klass) { Snippets::UpdateRepositoryStorageWorker }
-  end
-end

spec/workers/snippet_update_repository_storage_worker_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe SnippetUpdateRepositoryStorageWorker do
-  subject { described_class.new }
-
-  it_behaves_like 'an update storage move worker' do
-    let_it_be_with_refind(:container) { create(:snippet, :repository) }
-    let_it_be(:repository_storage_move) { create(:snippet_repository_storage_move) }
-
-    let(:service_klass) { Snippets::UpdateRepositoryStorageService }
-    let(:repository_storage_move_klass) { Snippets::RepositoryStorageMove }
-  end
-end