Merge branch '291069-stop-deploying-to-the-legacy-pages-storage-2' into 'master'

Removes GitLab Pages legacy storage lease

See merge request gitlab-org/gitlab!69377

app/services/pages/legacy_storage_lease.rb

-# frozen_string_literal: true
-
-module Pages
-  module LegacyStorageLease
-    extend ActiveSupport::Concern
-
-    include ::ExclusiveLeaseGuard
-
-    LEASE_TIMEOUT = 1.hour
-
-    def lease_key
-      "pages_legacy_storage:#{project.id}"
-    end
-
-    def lease_timeout
-      LEASE_TIMEOUT
-    end
-  end
-end

app/services/pages/migrate_legacy_storage_to_deployment_service.rb

@@ -2,10 +2,7 @@
 
 module Pages
   class MigrateLegacyStorageToDeploymentService
-    ExclusiveLeaseTakenError = Class.new(StandardError)
-
     include BaseServiceUtility
-    include ::Pages::LegacyStorageLease
 
     attr_reader :project
 
@@ -16,18 +13,6 @@ module Pages
     end
 
     def execute
-      result = try_obtain_lease do
-        execute_unsafe
-      end
-
-      raise ExclusiveLeaseTakenError, "Can't migrate pages for project #{project.id}: exclusive lease taken" if result.nil?
-
-      result
-    end
-
-    private
-
-    def execute_unsafe
       zip_result = ::Pages::ZipDirectoryService.new(project.pages_path, ignore_invalid_entries: @ignore_invalid_entries).execute
 
       if zip_result[:status] == :error

spec/services/pages/legacy_storage_lease_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ::Pages::LegacyStorageLease do
-  let(:project) { create(:project) }
-
-  let(:implementation) do
-    Class.new do
-      include ::Pages::LegacyStorageLease
-
-      attr_reader :project
-
-      def initialize(project)
-        @project = project
-      end
-
-      def execute
-        try_obtain_lease do
-          execute_unsafe
-        end
-      end
-
-      def execute_unsafe
-        true
-      end
-    end
-  end
-
-  let(:service) { implementation.new(project) }
-
-  it 'allows method to be executed' do
-    expect(service).to receive(:execute_unsafe).and_call_original
-
-    expect(service.execute).to eq(true)
-  end
-
-  context 'when another service holds the lease for the same project' do
-    around do |example|
-      implementation.new(project).try_obtain_lease do
-        example.run
-      end
-    end
-
-    it 'does not run guarded method' do
-      expect(service).not_to receive(:execute_unsafe)
-
-      expect(service.execute).to eq(nil)
-    end
-  end
-
-  context 'when another service holds the lease for the different project' do
-    around do |example|
-      implementation.new(create(:project)).try_obtain_lease do
-        example.run
-      end
-    end
-
-    it 'allows method to be executed' do
-      expect(service).to receive(:execute_unsafe).and_call_original
-
-      expect(service.execute).to eq(true)
-    end
-  end
-end

spec/services/pages/migrate_legacy_storage_to_deployment_service_spec.rb

@@ -114,13 +114,5 @@ RSpec.describe Pages::MigrateLegacyStorageToDeploymentService do
         described_class.new(project).execute
       end.not_to change { project.pages_metadatum.reload.pages_deployment_id }.from(old_deployment.id)
     end
-
-    it 'raises exception if exclusive lease is taken' do
-      described_class.new(project).try_obtain_lease do
-        expect do
-          described_class.new(project).execute
-        end.to raise_error(described_class::ExclusiveLeaseTakenError)
-      end
-    end
   end
 end