Remove the container expiration loopless feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

app/services/container_expiration_policies/cleanup_service.rb

@@ -49,7 +49,6 @@ module ContainerExpirationPolicies
     private
 
     def schedule_next_run_if_needed
-      return unless Feature.enabled?(:container_registry_expiration_policies_loopless)
       return if policy.next_run_at.future?
 
       repos_before_next_run = ::ContainerRepository.for_project_id(policy.project_id)

app/workers/container_expiration_policies/cleanup_container_repository_worker.rb

@@ -65,19 +65,9 @@ module ContainerExpirationPolicies
     def container_repository
       strong_memoize(:container_repository) do
         ContainerRepository.transaction do
-          # rubocop: disable CodeReuse/ActiveRecord
           # We need a lock to prevent two workers from picking up the same row
-          container_repository = if loopless_enabled?
-                                   next_container_repository
-                                 else
-                                   ContainerRepository.waiting_for_cleanup
-                                                      .order(:expiration_policy_cleanup_status, :expiration_policy_started_at)
-                                                      .limit(1)
-                                                      .lock('FOR UPDATE SKIP LOCKED')
-                                                      .first
-                                 end
-
-          # rubocop: enable CodeReuse/ActiveRecord
+          container_repository = next_container_repository
+
           container_repository&.tap(&:cleanup_ongoing!)
         end
       end
@@ -102,28 +92,20 @@ module ContainerExpirationPolicies
 
     def cleanup_scheduled_count
       strong_memoize(:cleanup_scheduled_count) do
-        if loopless_enabled?
-          limit = max_running_jobs + 1
-          ContainerExpirationPolicy.with_container_repositories
-                                   .runnable_schedules
-                                   .limit(limit)
-                                   .count
-        else
-          ContainerRepository.cleanup_scheduled.count
-        end
+        limit = max_running_jobs + 1
+        ContainerExpirationPolicy.with_container_repositories
+                                 .runnable_schedules
+                                 .limit(limit)
+                                 .count
       end
     end
 
     def cleanup_unfinished_count
       strong_memoize(:cleanup_unfinished_count) do
-        if loopless_enabled?
-          limit = max_running_jobs + 1
-          ContainerRepository.with_unfinished_cleanup
-                             .limit(limit)
-                             .count
-        else
-          ContainerRepository.cleanup_unfinished.count
-        end
+        limit = max_running_jobs + 1
+        ContainerRepository.with_unfinished_cleanup
+                           .limit(limit)
+                           .count
       end
     end
 
@@ -132,21 +114,13 @@ module ContainerExpirationPolicies
 
       now = Time.zone.now
 
-      if loopless_enabled?
-        policy.next_run_at < now || (now + max_cleanup_execution_time.seconds < policy.next_run_at)
-      else
-        now + max_cleanup_execution_time.seconds < policy.next_run_at
-      end
+      policy.next_run_at < now || (now + max_cleanup_execution_time.seconds < policy.next_run_at)
     end
 
     def throttling_enabled?
       Feature.enabled?(:container_registry_expiration_policies_throttling)
     end
 
-    def loopless_enabled?
-      Feature.enabled?(:container_registry_expiration_policies_loopless)
-    end
-
     def max_cleanup_execution_time
       ::Gitlab::CurrentSettings.container_registry_delete_tags_service_timeout
     end

app/workers/container_expiration_policy_worker.rb

@@ -38,18 +38,6 @@ class ContainerExpirationPolicyWorker # rubocop:disable Scalability/IdempotentWo
 
   def perform_throttled
     try_obtain_lease do
-      unless loopless_enabled?
-        with_runnable_policy do |policy|
-          ContainerExpirationPolicy.transaction do
-            policy.schedule_next_run!
-            ContainerRepository.for_project_id(policy.id)
-                               .each_batch do |relation|
-                                 relation.update_all(expiration_policy_cleanup_status: :cleanup_scheduled)
-                               end
-          end
-        end
-      end
-
       ContainerExpirationPolicies::CleanupContainerRepositoryWorker.perform_with_capacity
     end
   end
@@ -86,10 +74,6 @@ class ContainerExpirationPolicyWorker # rubocop:disable Scalability/IdempotentWo
     Feature.enabled?(:container_registry_expiration_policies_throttling)
   end
 
-  def loopless_enabled?
-    Feature.enabled?(:container_registry_expiration_policies_loopless)
-  end
-
   def lease_timeout
     5.hours
   end

config/feature_flags/development/container_registry_expiration_policies_loopless.yml

----
-name: container_registry_expiration_policies_loopless
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56962
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325273
-milestone: '13.11'
-type: development
-group: group::package
-default_enabled: false

spec/workers/container_expiration_policy_worker_spec.rb

@@ -34,101 +34,18 @@ RSpec.describe ContainerExpirationPolicyWorker do
       end
     end
 
-    context 'With no container expiration policies' do
-      context 'with loopless disabled' do
-        before do
-          stub_feature_flags(container_registry_expiration_policies_loopless: false)
-        end
-
-        it 'does not execute any policies' do
-          expect(ContainerRepository).not_to receive(:for_project_id)
-
-          expect { subject }.not_to change { ContainerRepository.cleanup_scheduled.count }
-        end
-      end
-    end
-
     context 'with throttling enabled' do
       before do
         stub_feature_flags(container_registry_expiration_policies_throttling: true)
       end
 
-      context 'with loopless disabled' do
-        before do
-          stub_feature_flags(container_registry_expiration_policies_loopless: false)
-        end
-
-        context 'with container expiration policies' do
-          let_it_be(:container_expiration_policy) { create(:container_expiration_policy, :runnable) }
-          let_it_be(:container_repository) { create(:container_repository, project: container_expiration_policy.project) }
-
-          before do
-            expect(worker).to receive(:with_runnable_policy).and_call_original
-          end
-
-          context 'with a valid container expiration policy' do
-            it 'schedules the next run' do
-              expect { subject }.to change { container_expiration_policy.reload.next_run_at }
-            end
-
-            it 'marks the container repository as scheduled for cleanup' do
-              expect { subject }.to change { container_repository.reload.cleanup_scheduled? }.from(false).to(true)
-              expect(ContainerRepository.cleanup_scheduled.count).to eq(1)
-            end
-
-            it 'calls the limited capacity worker' do
-              expect(ContainerExpirationPolicies::CleanupContainerRepositoryWorker).to receive(:perform_with_capacity)
-
-              subject
-            end
-          end
-
-          context 'with a disabled container expiration policy' do
-            before do
-              container_expiration_policy.disable!
-            end
-
-            it 'does not run the policy' do
-              expect(ContainerRepository).not_to receive(:for_project_id)
-
-              expect { subject }.not_to change { ContainerRepository.cleanup_scheduled.count }
-            end
-          end
+      it 'calls the limited capacity worker' do
+        expect(ContainerExpirationPolicies::CleanupContainerRepositoryWorker).to receive(:perform_with_capacity)
 
-          context 'with an invalid container expiration policy' do
-            let(:user) { container_expiration_policy.project.owner }
-
-            before do
-              container_expiration_policy.update_column(:name_regex, '*production')
-            end
-
-            it 'disables the policy and tracks an error' do
-              expect(ContainerRepository).not_to receive(:for_project_id)
-              expect(Gitlab::ErrorTracking).to receive(:log_exception).with(instance_of(described_class::InvalidPolicyError), container_expiration_policy_id: container_expiration_policy.id)
-
-              expect { subject }.to change { container_expiration_policy.reload.enabled }.from(true).to(false)
-              expect(ContainerRepository.cleanup_scheduled).to be_empty
-            end
-          end
-        end
-
-        it_behaves_like 'handling a taken exclusive lease'
+        subject
       end
 
-      context 'with loopless enabled' do
-        before do
-          stub_feature_flags(container_registry_expiration_policies_loopless: true)
-          expect(worker).not_to receive(:with_runnable_policy)
-        end
-
-        it 'calls the limited capacity worker' do
-          expect(ContainerExpirationPolicies::CleanupContainerRepositoryWorker).to receive(:perform_with_capacity)
-
-          subject
-        end
-
-        it_behaves_like 'handling a taken exclusive lease'
-      end
+      it_behaves_like 'handling a taken exclusive lease'
     end
 
     context 'with throttling disabled' do